From 7d2d38b5a9445fc8e550b964dc9d217cab1fc9e1 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Wed, 20 Sep 2023 12:15:23 +0200 Subject: [PATCH 1/8] ACS-5830 - Change pdf-renderer to 1.2 --- engines/aio/Dockerfile | 3 ++- engines/pdfrenderer/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index 88f076ef0..601a0d884 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -19,7 +19,8 @@ ARG LIBREOFFICE_VERSION=7.2.5 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/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/libreoffice-6.4.7.2-13.el8.aarch64.rpm -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 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 ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz ENV JAVA_OPTS="" diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile index 97751b6ca..3368d389b 100644 --- a/engines/pdfrenderer/Dockerfile +++ b/engines/pdfrenderer/Dockerfile @@ -4,7 +4,8 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 -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 ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz +# 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="" # Set default user information From e04d44ab0c486b1d76599e2780ce4c714d9a7970 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Wed, 20 Sep 2023 12:34:17 +0200 Subject: [PATCH 2/8] ACS-5830 - Check fail --- engines/pdfrenderer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile index 3368d389b..1a626fc11 100644 --- a/engines/pdfrenderer/Dockerfile +++ b/engines/pdfrenderer/Dockerfile @@ -4,7 +4,7 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 -ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz +ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.3-linux.tgz # 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="" From f424f7d963ba1e541afb4efe027570440916ae88 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Wed, 20 Sep 2023 13:26:25 +0200 Subject: [PATCH 3/8] ACS-5830 - Fix version --- engines/pdfrenderer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile index 1a626fc11..3368d389b 100644 --- a/engines/pdfrenderer/Dockerfile +++ b/engines/pdfrenderer/Dockerfile @@ -4,7 +4,7 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 -ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.3-linux.tgz +ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz # 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="" From 144bf7b22a753a96a930889472b50d953189a5a7 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Thu, 21 Sep 2023 14:13:27 +0200 Subject: [PATCH 4/8] ACS-5830 - Release 2 arch --- engines/aio/Dockerfile | 14 ++++++++++---- engines/aio/pom.xml | 7 +++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index 601a0d884..92297245f 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -19,8 +19,8 @@ ARG LIBREOFFICE_VERSION=7.2.5 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/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/libreoffice-6.4.7.2-13.el8.aarch64.rpm -#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 ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz +ENV ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux-arm.tgz ENV JAVA_OPTS="" @@ -52,9 +52,15 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \ update-alternatives --set java java-17-openjdk.aarch64; \ fi && \ - curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ - tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ - rm -f alfresco-pdf-renderer-linux.tgz && \ + if [ "$(uname -m)" = "x86_64" ]; then \ + curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ + tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ + rm -f alfresco-pdf-renderer-linux.tgz; \ + else \ + curl -s -S $ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ + tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ + rm -f alfresco-pdf-renderer-linux.tgz; \ + fi && \ curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \ tar xzf ${EXIFTOOL_FOLDER}.tgz && \ yum -y install perl perl-ExtUtils-MakeMaker make && \ diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml index 6345a6954..3bbe18235 100644 --- a/engines/aio/pom.xml +++ b/engines/aio/pom.xml @@ -12,7 +12,8 @@ - alfresco/alfresco-transform-core-aio + + alfresco/dev ${project.artifactId} @@ -339,7 +340,7 @@ - ${image.name}:${image.tag} + ${image.name}:alfresco-transform-core-aio-pdf ${image.registry} @@ -358,6 +359,7 @@ + From 436d5715417e7a8e67e277e24b174a9c80ff90ca Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Tue, 26 Sep 2023 17:50:30 +0200 Subject: [PATCH 5/8] ACS-5830 - Release 2 arch image for pdf-renderer --- engines/aio/pom.xml | 7 ++----- engines/pdfrenderer/Dockerfile | 8 ++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml index 3bbe18235..6345a6954 100644 --- a/engines/aio/pom.xml +++ b/engines/aio/pom.xml @@ -12,8 +12,7 @@ - - alfresco/dev + alfresco/alfresco-transform-core-aio ${project.artifactId} @@ -340,7 +339,7 @@ - ${image.name}:alfresco-transform-core-aio-pdf + ${image.name}:${image.tag} ${image.registry} @@ -359,7 +358,6 @@ - diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile index 3368d389b..436e4003e 100644 --- a/engines/pdfrenderer/Dockerfile +++ b/engines/pdfrenderer/Dockerfile @@ -5,7 +5,7 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz -# 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 ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux-arm.tgz ENV JAVA_OPTS="" # Set default user information @@ -17,7 +17,11 @@ ARG USERID=33001 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 && \ - curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ + if [ "$(uname -m)" = "x86_64" ]; then \ + curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \ + else \ + curl -s -S $ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \ + fi && \ tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ rm -f alfresco-pdf-renderer-linux.tgz && \ yum clean all From 90378828dd279707a2df3f59cfdb94521fc272b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20=C5=9Awi=C4=99to=C5=84?= Date: Thu, 28 Sep 2023 09:47:44 +0200 Subject: [PATCH 6/8] Update engines/aio/Dockerfile Co-authored-by: Domenico Sibilio --- engines/aio/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index 92297245f..72318df0c 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -19,8 +19,9 @@ ARG LIBREOFFICE_VERSION=7.2.5 ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/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/libreoffice-6.4.7.2-13.el8.aarch64.rpm -ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz -ENV ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux-arm.tgz +ARG PDF_RENDERER_VERSION=1.2 +ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/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/content/org/alfresco/alfresco-pdf-renderer/${PDF_RENDERER_VERSION}/alfresco-pdf-renderer-${PDF_RENDERER_VERSION}-linux-arm.tgz ENV JAVA_OPTS="" From 194a8a03b8b6c56d17dd304da26d34897807c881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20=C5=9Awi=C4=99to=C5=84?= Date: Thu, 28 Sep 2023 10:16:11 +0200 Subject: [PATCH 7/8] Update engines/pdfrenderer/Dockerfile Co-authored-by: Domenico Sibilio --- engines/pdfrenderer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile index 436e4003e..a94aedcd7 100644 --- a/engines/pdfrenderer/Dockerfile +++ b/engines/pdfrenderer/Dockerfile @@ -4,8 +4,9 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 -ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz -ENV ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux-arm.tgz +ARG PDF_RENDERER_VERSION=1.2 +ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/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/content/org/alfresco/alfresco-pdf-renderer/${PDF_RENDERER_VERSION}/alfresco-pdf-renderer-${PDF_RENDERER_VERSION}-linux-arm.tgz ENV JAVA_OPTS="" # Set default user information From 54c8774a57a5b63e8e1600221be4fcb9ea46bc99 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Thu, 28 Sep 2023 13:16:28 +0200 Subject: [PATCH 8/8] ACS-5830 - Code review fixes --- engines/aio/Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index 72318df0c..bbb3e27a3 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -37,10 +37,10 @@ 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; \ - else \ - yum install -y ${IMAGEMAGICK_RPM_URL}-arm64.rpm ${IMAGEMAGICK_RPM_URL}-arm64-libs.rpm; \ - fi && \ + yum install -y ${IMAGEMAGICK_RPM_URL}-el8.rpm ${IMAGEMAGICK_RPM_URL}-el8-libs.rpm; \ + else \ + yum install -y ${IMAGEMAGICK_RPM_URL}-arm64.rpm ${IMAGEMAGICK_RPM_URL}-arm64-libs.rpm; \ + fi && \ yum install -y cairo cups-libs libSM libGLU && \ if [ "$(uname -m)" = "x86_64" ]; then \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ @@ -54,14 +54,12 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ update-alternatives --set java java-17-openjdk.aarch64; \ fi && \ if [ "$(uname -m)" = "x86_64" ]; then \ - curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ - tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ - rm -f alfresco-pdf-renderer-linux.tgz; \ + curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \ else \ - curl -s -S $ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ - tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ - rm -f alfresco-pdf-renderer-linux.tgz; \ + curl -s -S $ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \ fi && \ + tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \ + rm -f alfresco-pdf-renderer-linux.tgz && \ curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \ tar xzf ${EXIFTOOL_FOLDER}.tgz && \ yum -y install perl perl-ExtUtils-MakeMaker make && \