ACS-6450 - Update curl

Alfresco · Jan 31, 2024 · 0f35052 · 0f35052
1 parent 7c1c1fd
commit 0f35052
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
@@ -17,7 +17,7 @@ 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-
+ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/
 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
@@ -49,8 +49,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 \
-      LIBREOFFICE_ARM64_RPM_VERSION=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | perl -nle 'print $& if m{href="libreoffice-\K[6-7]+\.[0-9]+(\.[0-9]+)?(\.[0-9]+)?-[0-9]{0,2}\.el8\.aarch64\.rpm}' | sort -V | tail -1) && \
-      dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL$LIBREOFFICE_ARM64_RPM_VERSION && \
+      LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o '"libreoffice-6.4.7.2.*"' | cut -d '"' -f 2) && \
+      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
@@ -7,7 +7,7 @@ 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-
+ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/
 ENV JAVA_OPTS=""
 
 # Set default user information
@@ -28,8 +28,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 \
-      LIBREOFFICE_ARM64_RPM_VERSION=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | perl -nle 'print $& if m{href="libreoffice-\K[6-7]+\.[0-9]+(\.[0-9]+)?(\.[0-9]+)?-[0-9]{0,2}\.el8\.aarch64\.rpm}' | sort -V | tail -1) && \
-      dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL$LIBREOFFICE_ARM64_RPM_VERSION && \
+      LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o '"libreoffice-6.4.7.2.*"' | cut -d '"' -f 2) && \
+      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