From 436d5715417e7a8e67e277e24b174a9c80ff90ca Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Tue, 26 Sep 2023 17:50:30 +0200 Subject: [PATCH] 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