From 5d807fca1a51f8d9eb214d18801ab616147d9e2a Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Oct 2018 16:58:15 +0100 Subject: [PATCH 1/5] ATS-71: Update Dockerfiles to OpenJDK 11 base java image (RC hence WIP) --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 2 +- alfresco-docker-imagemagick/Dockerfile | 2 +- alfresco-docker-libreoffice/Dockerfile | 2 +- alfresco-docker-tika/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index c2334389..4bc4843a 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:8 +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index db121c6e..40c50677 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:8 +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index 80aa75f7..8b0a3e8c 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:8 +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index fb20d99b..1cef5d4c 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -3,7 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:8 +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt From f6c9976b3fe21ba35c432078d775fb5594def41e Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Oct 2018 17:37:53 +0100 Subject: [PATCH 2/5] ATS-132: whitesource high (cxf-rt-transports-http-3.0.16) - update to 3.1.16 - initially on ATS-71 branch (can be cherry-picked) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f434468..ef4f6a98 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ org.apache.cxf cxf-rt-transports-http - 3.0.16 + 3.1.16 From 15866719d049eb76e07b5b83ebd4cc6a703bef89 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Oct 2018 20:59:40 +0100 Subject: [PATCH 3/5] ATS-132: whitesource high (cxf-rt-transports-http-3.1.16) - update to 3.2.6 (whitesource db shows as fixed in 3.2.6 & 3.1.16-redhat-1, but not 3.1.16 ?) - initially on ATS-71 branch (can be cherry-picked) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef4f6a98..81cb6d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ org.apache.cxf cxf-rt-transports-http - 3.1.16 + 3.2.6 From 9ca66a1411b52d24c24c93d846fef8bfcef35bd7 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 3 Oct 2018 21:12:55 +0100 Subject: [PATCH 4/5] ATS-71: Update Dockerfile to OpenJDK 11 base java image RC (WIP) - note: temporarily RC from quay.io pending release to dockerhub.com/r/alfresco --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 3 ++- alfresco-docker-imagemagick/Dockerfile | 3 ++- alfresco-docker-libreoffice/Dockerfile | 3 ++- alfresco-docker-tika/Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index 4bc4843a..7781e2e0 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -3,7 +3,8 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) +FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 40c50677..0178f6cd 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -3,7 +3,8 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) +FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index 8b0a3e8c..97f0a0ae 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -3,7 +3,8 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) +FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index 1cef5d4c..0c21a172 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -3,7 +3,8 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) +FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt From 06da201d1be49669a2c1584de3ed9b8aa6218d5f Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Fri, 5 Oct 2018 09:57:17 +0100 Subject: [PATCH 5/5] ATS-71: Update Dockerfile to OpenJDK 11 image - Alfresco Java Base docker image (11-openjdk-centos-7-95536c8b599f) --- alfresco-docker-alfresco-pdf-renderer/Dockerfile | 3 +-- alfresco-docker-imagemagick/Dockerfile | 3 +-- alfresco-docker-libreoffice/Dockerfile | 3 +-- alfresco-docker-tika/Dockerfile | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/Dockerfile b/alfresco-docker-alfresco-pdf-renderer/Dockerfile index 7781e2e0..25046987 100644 --- a/alfresco-docker-alfresco-pdf-renderer/Dockerfile +++ b/alfresco-docker-alfresco-pdf-renderer/Dockerfile @@ -3,8 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) -FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-95536c8b599f ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV PDFIUM_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/pdfium.txt diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile index 0178f6cd..27963f21 100644 --- a/alfresco-docker-imagemagick/Dockerfile +++ b/alfresco-docker-imagemagick/Dockerfile @@ -3,8 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. -# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) -FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-95536c8b599f ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile index 97f0a0ae..2f49d00a 100644 --- a/alfresco-docker-libreoffice/Dockerfile +++ b/alfresco-docker-libreoffice/Dockerfile @@ -3,8 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) -FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-95536c8b599f ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt diff --git a/alfresco-docker-tika/Dockerfile b/alfresco-docker-tika/Dockerfile index 0c21a172..4a2ab208 100644 --- a/alfresco-docker-tika/Dockerfile +++ b/alfresco-docker-tika/Dockerfile @@ -3,8 +3,7 @@ # The container is only intended to be used with the Alfresco Enterprise editon which is covered by https://www.alfresco.com/legal/agreements and https://www.alfresco.com/terms-use. # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -# TODO ATS-71 - remove quay.io once released (to dockerhub) (DEPLOY-574) -FROM quay.io/alfresco/alfresco-base-java:11-openjdk-centos-7-release-candidate +FROM alfresco/alfresco-base-java:11-openjdk-centos-7-95536c8b599f ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt