From 144bf7b22a753a96a930889472b50d953189a5a7 Mon Sep 17 00:00:00 2001 From: "Wojtek.Swieton" Date: Thu, 21 Sep 2023 14:13:27 +0200 Subject: [PATCH] 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 @@ +