ACS-8370 Switch to new tags for java base image (#987)

* ACS-8370 Switch to new tags for java base images in Dockerfiles * ACS-8370 Switch to new tags for java base images in Dockerfiles * ACS-8370 Fix dependabot * ACS-8370 Update * ACS-8370 Update * ACS-8370 Update * ACS-8370 Update aio * ACS-8370 Update aio * ACS-8370 Enable verbose * ACS-8370 Update url * ACS-8370 Install procps * ACS-8370 Install procps * Revert "ACS-8370 Enable verbose" This reverts commit b38344e11d81d45840f5714029cca1f5163cc405. * ACS-8370 Update alfresco-base-java sha * ACS-8370 Fix libreoffice engine image
2025-05-26 17:24:47 +00:00 · 2024-08-07 09:51:05 +02:00 · 2024-08-07 09:51:05 +02:00 · 3c46ac2284
commit 3c46ac2284
parent 5e7f7b8f72
8 changed files with 32 additions and 25 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -16,42 +16,42 @@ updates:
  registries:
  - maven-alfresco-internal
 - package-ecosystem: docker
-  directory: "/engines/aio"
+  directory: "engines/aio"
  schedule:
    interval: daily
    time: "22:00"
    timezone: Europe/London
  open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/engines/libreoffice"
+  directory: "engines/libreoffice"
  schedule:
    interval: daily
    time: "22:00"
    timezone: Europe/London
  open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/engines/imagemagick"
+  directory: "engines/imagemagick"
  schedule:
    interval: daily
    time: "22:00"
    timezone: Europe/London
  open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/engines/misc"
+  directory: "engines/misc"
  schedule:
    interval: daily
    time: "22:00"
    timezone: Europe/London
  open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/engines/tika"
+  directory: "engines/tika"
  schedule:
    interval: daily
    time: "22:00"
    timezone: Europe/London
  open-pull-requests-limit: 99
 - package-ecosystem: docker
-  directory: "/engines/pdfrenderer"
+  directory: "engines/pdfrenderer"
  schedule:
    interval: daily
    time: "22:00"
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@ -5,20 +5,21 @@
 # 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:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}
 ARG EXIFTOOL_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/exiftool/image-exiftool/${EXIFTOOL_VERSION}/image-exiftool-${EXIFTOOL_VERSION}.tgz

 ARG IMAGEMAGICK_VERSION=7.1.0-16
-ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-3/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-3
+ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-10/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-10
 ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm

 ARG LIBREOFFICE_VERSION=7.2.5
 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
-ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/
-ENV LIBREOFFICE_ARM64_RPM_VERSION=libreoffice-6.4.7.2
+ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/9/devel/aarch64/os/Packages/l/
+ENV LIBREOFFICE_ARM64_RPM_VERSION=libreoffice-7.1.8.1
 ARG PDF_RENDERER_VERSION=1.2
 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/org/alfresco/alfresco-pdf-renderer/${PDF_RENDERER_VERSION}/alfresco-pdf-renderer-${PDF_RENDERER_VERSION}-linux.tgz
 ENV ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/org/alfresco/alfresco-pdf-renderer/${PDF_RENDERER_VERSION}/alfresco-pdf-renderer-${PDF_RENDERER_VERSION}-linux-arm.tgz
@ -37,11 +38,11 @@ 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 install -y $IMAGEMAGICK_DEP_RPM_URL && \
    if [ "$(uname -m)" = "x86_64" ]; then \
-      yum install -y ${IMAGEMAGICK_RPM_URL}-el8.rpm ${IMAGEMAGICK_RPM_URL}-el8-libs.rpm; \
+      yum install -y ${IMAGEMAGICK_RPM_URL}-el9.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9.rpm; \
    else \
-      yum install -y ${IMAGEMAGICK_RPM_URL}-arm64.rpm ${IMAGEMAGICK_RPM_URL}-arm64-libs.rpm; \
+      yum install -y ${IMAGEMAGICK_RPM_URL}-el9-aarch64.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9-aarch64.rpm; \
    fi && \
-    yum install -y cairo cups-libs libSM libGLU && \
+    yum install -y cairo cups-libs libSM libGLU procps && \
    if [ "$(uname -m)" = "x86_64" ]; then \
      test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
      ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \
--- a/engines/example/Dockerfile
+++ b/engines/example/Dockerfile
@ -1,4 +1,5 @@
-FROM alfresco/alfresco-base-java:jre17-rockylinux8-202302221525
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}
--- a/engines/imagemagick/Dockerfile
+++ b/engines/imagemagick/Dockerfile
@ -2,12 +2,13 @@

 # 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:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 # For other ImageMagick versions please look at https://github.com/Alfresco/imagemagick-build tags
 ARG IMAGEMAGICK_VERSION=7.1.0-16

-ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-3/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-3
+ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-10/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-10
 ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 ENV JAVA_OPTS=""

@ -22,9 +23,9 @@ 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 install -y $IMAGEMAGICK_DEP_RPM_URL && \
    if [ "$(uname -m)" = "x86_64" ]; then \
-            yum install -y ${IMAGEMAGICK_RPM_URL}-el8.rpm ${IMAGEMAGICK_RPM_URL}-el8-libs.rpm; \
+            yum install -y ${IMAGEMAGICK_RPM_URL}-el9.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9.rpm; \
        else \
-            yum install -y ${IMAGEMAGICK_RPM_URL}-arm64.rpm ${IMAGEMAGICK_RPM_URL}-arm64-libs.rpm; \
+            yum install -y ${IMAGEMAGICK_RPM_URL}-el9-aarch64.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9-aarch64.rpm; \
        fi && \
    yum clean all

--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@ -2,13 +2,14 @@

 # 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:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ARG LIBREOFFICE_VERSION=7.2.5

 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
-ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/
-ENV LIBREOFFICE_ARM64_RPM_VERSION=libreoffice-6.4.7.2
+ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/9/devel/aarch64/os/Packages/l/
+ENV LIBREOFFICE_ARM64_RPM_VERSION=libreoffice-7.1.8.1
 ENV JAVA_OPTS=""

 # Set default user information
@ -20,7 +21,7 @@ ARG USERID=33003
 COPY target/${env.project_artifactId}-${env.project_version}.jar libreoffice-dist-*-linux.gz /

 RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \
-    yum install -y cairo cups-libs libSM libGLU && \
+    yum install -y cairo cups-libs libSM libGLU procps && \
    if [ "$(uname -m)" = "x86_64" ]; then \
        test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
        ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \
--- a/engines/misc/Dockerfile
+++ b/engines/misc/Dockerfile
@ -1,6 +1,7 @@
 # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.

-FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ENV JAVA_OPTS=""

--- a/engines/pdfrenderer/Dockerfile
+++ b/engines/pdfrenderer/Dockerfile
@ -2,7 +2,8 @@

 # 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:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ARG PDF_RENDERER_VERSION=1.2
 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/org/alfresco/alfresco-pdf-renderer/${PDF_RENDERER_VERSION}/alfresco-pdf-renderer-${PDF_RENDERER_VERSION}-linux.tgz
--- a/engines/tika/Dockerfile
+++ b/engines/tika/Dockerfile
@ -2,7 +2,8 @@

 # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.

-FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108
+# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a

 ARG EXIFTOOL_VERSION=12.25
 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}