From 89c65cd4f22521ded1e56491197b90b4b6d46f85 Mon Sep 17 00:00:00 2001 From: montgolfiere Date: Thu, 30 Apr 2020 16:55:33 +0100 Subject: [PATCH] ACS-99: Update to most current Java Base Image (for OpenJDK 11.0.7 / CentOS 7) (#238) - align with ACS Repo 6.2.1-A4 and higher (note: post RC3) --- .../alfresco-transform-core-aio-boot/Dockerfile | 2 +- .../alfresco-transform-imagemagick-boot/Dockerfile | 2 +- .../alfresco-transform-libreoffice-boot/Dockerfile | 2 +- alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile | 2 +- .../alfresco-transform-pdf-renderer-boot/Dockerfile | 2 +- alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile index 7db8472c..e38b738e 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -5,7 +5,7 @@ # ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt. # 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.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile index 5c45b496..645ae4cc 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile @@ -2,7 +2,7 @@ # 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.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca ARG IMAGEMAGICK_VERSION=7.0.7-27 diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index d1c08b98..80bc6c3a 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile @@ -2,7 +2,7 @@ # 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.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca ARG LIBREOFFICE_VERSION=6.3.5 diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile index 734d0169..3f85bc1e 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS="" diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile index 9f704c0c..2b5569c2 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile @@ -2,7 +2,7 @@ # 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.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca 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-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index e0bbc73f..39f41ee3 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-72b88c6f1f4c +FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt ENV JAVA_OPTS=""