From 79b98a1661307b60c598113dfc33f51c8b77f118 Mon Sep 17 00:00:00 2001 From: Denis Ungureanu Date: Tue, 5 Feb 2019 13:51:38 +0000 Subject: [PATCH] ATS-267 : Bundle 3rd Party licenses in Docker images --- .../Dockerfile | 4 ++++ alfresco-docker-alfresco-pdf-renderer/pom.xml | 5 ++++- alfresco-docker-imagemagick/Dockerfile | 4 ++++ alfresco-docker-imagemagick/pom.xml | 4 ++++ alfresco-docker-libreoffice/Dockerfile | 4 ++++ alfresco-docker-libreoffice/pom.xml | 6 ++++-- alfresco-docker-tika/Dockerfile | 4 ++++ alfresco-docker-tika/pom.xml | 4 ++++ pom.xml | 20 ++++++++++++++++++- 9 files changed, 51 insertions(+), 4 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index d769976d..a9b2c703 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -20,6 +20,10 @@ RUN ln /usr/bin/alfresco-docker-alfresco-pdf-renderer-${env.project_version}.jar yum remove -y wget && \ yum clean all +ADD target/generated-resources/licenses /licenses +ADD target/generated-resources/licenses.xml /licenses/ +ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ + EXPOSE 8090 ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-alfresco-pdf-renderer.jar diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index 3b47e8a5..910e1b7c 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -59,7 +59,10 @@ - + + org.codehaus.mojo + license-maven-plugin + io.fabric8 fabric8-maven-plugin diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 09ada4c6..ef07cfff 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -22,6 +22,10 @@ RUN ln /usr/bin/alfresco-docker-imagemagick-${env.project_version}.jar /usr/bin/ yum remove -y wget && \ yum clean all +ADD target/generated-resources/licenses /licenses +ADD target/generated-resources/licenses.xml /licenses/ +ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ + EXPOSE 8090 ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-imagemagick.jar diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index ebea50ce..3b675022 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -59,6 +59,10 @@ + + org.codehaus.mojo + license-maven-plugin + io.fabric8 fabric8-maven-plugin diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index 125c66f6..1e63e2b9 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -22,6 +22,10 @@ RUN ln /usr/bin/alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/ yum remove -y wget && \ yum clean all +ADD target/generated-resources/licenses /licenses +ADD target/generated-resources/licenses.xml /licenses/ +ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ + EXPOSE 8090 ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-libreoffice.jar diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 0858ac1c..f7f8514e 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -67,8 +67,10 @@ - - + + org.codehaus.mojo + license-maven-plugin + io.fabric8 fabric8-maven-plugin diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index 75b99957..7bbcac42 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -16,6 +16,10 @@ RUN ln /usr/bin/alfresco-docker-tika-${env.project_version}.jar /usr/bin/alfresc yum remove -y wget && \ yum clean all +ADD target/generated-resources/licenses /licenses +ADD target/generated-resources/licenses.xml /licenses/ +ADD target/generated-sources/license/THIRD-PARTY.txt /licenses/ + EXPOSE 8090 ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-docker-tika.jar diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index d107d243..907634e0 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -131,6 +131,10 @@ + + org.codehaus.mojo + license-maven-plugin + io.fabric8 fabric8-maven-plugin diff --git a/pom.xml b/pom.xml index 784e131e..5efabac2 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ https://artifacts.alfresco.com/nexus/content/repositories/enterprise-snapshots - + @@ -159,6 +159,24 @@ maven-release-plugin 2.5.3 + + org.codehaus.mojo + license-maven-plugin + 1.16 + + + + add-third-party + download-licenses + + + + + true + provided,test + org.alfresco + +