From 99128043c4ae568edfe950a8a0dda249a29468e9 Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Mon, 29 Jan 2024 11:07:16 +0100
Subject: [PATCH 1/9] ACS-6450 Try to sort images to get latest version

---
 engines/aio/Dockerfile         | 3 +--
 engines/libreoffice/Dockerfile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index df305972d..83fe04ab6 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -17,8 +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-6.4.7.2-15.el8.aarch64.rpm
-
+LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 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
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index a626d5377..2221ff4a9 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -7,8 +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-6.4.7.2-15.el8.aarch64.rpm
-ENV JAVA_OPTS=""
+LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 
 # Set default user information
 ARG GROUPNAME=Alfresco

From f8773a2666aaaa2dcff8b80436ee06c3685c1b85 Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Mon, 29 Jan 2024 11:23:50 +0100
Subject: [PATCH 2/9] ACS-6450 Add missing ENV

---
 engines/aio/Dockerfile         | 2 +-
 engines/libreoffice/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 83fe04ab6..3c1832147 100644
--- 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
-LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
+ENV LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 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
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index 2221ff4a9..338b863ae 100644
--- 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
-LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
+ENV LIBREOFFICE_ARM64_RPM_URL=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 
 # Set default user information
 ARG GROUPNAME=Alfresco

From b9fb5036667cf86c5c37db52eee4fc5371dcbb84 Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Tue, 30 Jan 2024 09:59:54 +0100
Subject: [PATCH 3/9] ACS-6450 Remove as ENV variable

---
 engines/aio/Dockerfile         | 2 +-
 engines/libreoffice/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 3c1832147..13b793646 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -17,7 +17,6 @@ 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=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 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,6 +48,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) \
       dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index 338b863ae..c856e9c2b 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -7,7 +7,6 @@ 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=$(wget -qO- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1)
 
 # Set default user information
 ARG GROUPNAME=Alfresco
@@ -27,6 +26,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) \
       dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \

From a8580efea0c667c35a639b2c91e1d3183e533bf9 Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Tue, 30 Jan 2024 11:00:43 +0100
Subject: [PATCH 4/9] ACS-6450 Fix flags

---
 engines/aio/Dockerfile         | 2 +-
 engines/libreoffice/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 13b793646..718600517 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -48,7 +48,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) \
+      LIBREOFFICE_ARM64_RPM_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o -P 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) && \
       dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index c856e9c2b..e3ba8a423 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -26,7 +26,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -oP 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) \
+      LIBREOFFICE_ARM64_RPM_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o -P 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) && \
       dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \

From dd71b75584358468899638ec151e14db01cd4b8e Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Tue, 30 Jan 2024 15:12:47 +0100
Subject: [PATCH 5/9] ACS-6450 Fix regex

---
 engines/aio/Dockerfile         | 3 ++-
 engines/libreoffice/Dockerfile | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 718600517..cfb24e54b 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -17,6 +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-
 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
@@ -48,7 +49,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o -P 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) && \
+      $LIBREOFFICE_ARM64_RPM_URL+=$(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 && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index e3ba8a423..5155a9ff7 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -7,6 +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-
+ENV JAVA_OPTS=""
 
 # Set default user information
 ARG GROUPNAME=Alfresco
@@ -26,7 +28,7 @@ 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_URL=$(wget -O- https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/ | grep -o -P 'href="libreoffice-\K[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -1) && \
+      $LIBREOFFICE_ARM64_RPM_URL+=$(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 && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \

From 7c1c1fd79d23dbd478133abe7f3d8180795aaad1 Mon Sep 17 00:00:00 2001
From: mikolajbrzezinski <mikolaj.brzezinski@hyland.com>
Date: Wed, 31 Jan 2024 09:11:07 +0100
Subject: [PATCH 6/9] ACS-6450 Change to 2 separate variables

---
 engines/aio/Dockerfile         | 4 ++--
 engines/libreoffice/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index cfb24e54b..5ff05c624 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -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_URL+=$(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=$(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 && \
       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 5155a9ff7..78d23d34b 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -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_URL+=$(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=$(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 && \
       update-alternatives --set java java-17-openjdk.aarch64; \
     fi && \
       yum clean all

From 0f35052596bbd5ed08982edbfa792efc270b82e6 Mon Sep 17 00:00:00 2001
From: "Wojtek.Swieton" <wojtek.swieton@hyland.com>
Date: Wed, 31 Jan 2024 12:02:58 +0100
Subject: [PATCH 7/9] ACS-6450 - Update curl

---
 engines/aio/Dockerfile         | 6 +++---
 engines/libreoffice/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 5ff05c624..c6dbe5d9a 100644
--- 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
index 78d23d34b..2fab25644 100644
--- 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

From da0e9917149379388732aa895e92847869f2762e Mon Sep 17 00:00:00 2001
From: "Wojtek.Swieton" <wojtek.swieton@hyland.com>
Date: Thu, 1 Feb 2024 09:48:47 +0100
Subject: [PATCH 8/9] ACS-6450 - Use ENV variable in curl command

---
 engines/aio/Dockerfile         | 2 +-
 engines/libreoffice/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index c6dbe5d9a..85c8b23e2 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -49,7 +49,7 @@ 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=$(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) && \
+      LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | 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 && \
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index 2fab25644..cccfe35e1 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -28,7 +28,7 @@ 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=$(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) && \
+      LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | 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 && \

From 55b4abdbb450249df8310b12ee448a220877dedc Mon Sep 17 00:00:00 2001
From: "Wojtek.Swieton" <wojtek.swieton@hyland.com>
Date: Fri, 9 Feb 2024 15:03:24 +0100
Subject: [PATCH 9/9] ACS-6450 - Update ENV variable for
 LIBREOFFICE_ARM64_RPM_VERSION

---
 engines/aio/Dockerfile         | 3 ++-
 engines/libreoffice/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/aio/Dockerfile b/engines/aio/Dockerfile
index 85c8b23e2..2c27aa4ca 100644
--- a/engines/aio/Dockerfile
+++ b/engines/aio/Dockerfile
@@ -18,6 +18,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/
+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
@@ -49,7 +50,7 @@ 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=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o '"libreoffice-6.4.7.2.*"' | cut -d '"' -f 2) && \
+      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 && \
diff --git a/engines/libreoffice/Dockerfile b/engines/libreoffice/Dockerfile
index cccfe35e1..a5fcae47e 100644
--- a/engines/libreoffice/Dockerfile
+++ b/engines/libreoffice/Dockerfile
@@ -8,6 +8,7 @@ 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/
+ENV LIBREOFFICE_ARM64_RPM_VERSION=libreoffice-6.4.7.2
 ENV JAVA_OPTS=""
 
 # Set default user information
@@ -28,7 +29,7 @@ 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=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o '"libreoffice-6.4.7.2.*"' | cut -d '"' -f 2) && \
+      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 && \