From 8f07408e846b646d30ccef08d5db165b5d2d705a Mon Sep 17 00:00:00 2001 From: Lev Belava Date: Fri, 10 Sep 2021 16:02:19 +0200 Subject: [PATCH] ATS-961 Security - update Java Base Image to Cent OS 7 --- .../alfresco-transform-core-aio-boot/Dockerfile | 3 ++- .../alfresco-transform-imagemagick-boot/Dockerfile | 3 ++- .../alfresco-transform-libreoffice-boot/Dockerfile | 2 +- .../alfresco-transform-misc-boot/Dockerfile | 2 +- .../alfresco-transform-pdf-renderer-boot/Dockerfile | 2 +- .../alfresco-transform-tika-boot/Dockerfile | 2 +- 6 files changed, 8 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 d314c739..07070ef9 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} @@ -32,6 +32,7 @@ ARG USERID=33017 COPY target/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin/alfresco-transform-core-aio-boot.jar && \ + yum clean all && \ curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \ curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \ curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \ diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile index cdf322e3..0665c2b4 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 ARG IMAGEMAGICK_VERSION=7.0.10-59 @@ -20,6 +20,7 @@ ARG USERID=33002 COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ + yum clean all && \ curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \ curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \ curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index 43e270d2..1fe7d521 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 ARG LIBREOFFICE_VERSION=7.0.6 diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile index 0f7ebe12..fb86822d 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 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 2e83187a..28098267 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 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 JAVA_OPTS="" diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index 03dd0bde..abaad05c 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.12-centos-811@sha256:f1bb731da820f33dc1e3cfe27d3192b67d68237d0a4441829140dfbd1e48c8a5 +FROM alfresco/alfresco-base-java:11.0.12-centos-7@sha256:6abdbfd14492fb78ae5d865eb25627bb241b11da406ef8df91a77716a3538f36 ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}