From aae8bb80a4a67fe04fedb4d27073d591f901f7da Mon Sep 17 00:00:00 2001 From: mikolajbrzezinski <86791239+mikolajbrzezinski@users.noreply.github.com> Date: Tue, 13 Feb 2024 09:23:39 +0100 Subject: [PATCH] ACS-6450 Dynamically determine ARM64 LibreOffice download link (#923) Dynamically determine ARM64 LibreOffice download link Co-authored-by: Wojtek.Swieton --- engines/aio/Dockerfile | 7 ++++--- engines/libreoffice/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile index 47fef57c..211b9c8c 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -17,8 +17,8 @@ ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-l 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-15.el8.aarch64.rpm - +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 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 @@ -50,7 +50,8 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ yum localinstall -y LibreOffice*/RPMS/*.rpm && \ rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \ else \ - dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \ + LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o "${LIBREOFFICE_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1) && \ + dnf --enablerepo=devel install -y ${LIBREOFFICE_ARM64_RPM_URL}${LIBREOFFICE_ARM64_RPM_VERSION} && \ update-alternatives --set java java-17-openjdk.aarch64; \ fi && \ if [ "$(uname -m)" = "x86_64" ]; then \ diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile index a626d537..a5fcae47 100644 --- a/engines/libreoffice/Dockerfile +++ b/engines/libreoffice/Dockerfile @@ -7,7 +7,8 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108 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-15.el8.aarch64.rpm +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 JAVA_OPTS="" # Set default user information @@ -28,7 +29,8 @@ RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.proj yum localinstall -y LibreOffice*/RPMS/*.rpm && \ rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \ else \ - dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \ + LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o "${LIBREOFFICE_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1) && \ + dnf --enablerepo=devel install -y ${LIBREOFFICE_ARM64_RPM_URL}${LIBREOFFICE_ARM64_RPM_VERSION} && \ update-alternatives --set java java-17-openjdk.aarch64; \ fi && \ yum clean all