From 75b9df332f9ce3653a8010bd8e947f6ed637566c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Fri, 29 Mar 2024 12:09:20 +0100 Subject: [PATCH] Use latest available libreoffice package (#945) --- 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 211b9c8c..8362acf0 100644 --- a/engines/aio/Dockerfile +++ b/engines/aio/Dockerfile @@ -50,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_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1) && \ + LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o "${LIBREOFFICE_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1 | sort | tail -n1) && \ 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 a5fcae47..34998ba8 100644 --- a/engines/libreoffice/Dockerfile +++ b/engines/libreoffice/Dockerfile @@ -29,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_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1) && \ + LIBREOFFICE_ARM64_RPM_VERSION=$(curl -s $LIBREOFFICE_ARM64_RPM_URL | grep -o "${LIBREOFFICE_ARM64_RPM_VERSION}.*" | cut -d '"' -f 1 | sort | tail -n1) && \ dnf --enablerepo=devel install -y ${LIBREOFFICE_ARM64_RPM_URL}${LIBREOFFICE_ARM64_RPM_VERSION} && \ update-alternatives --set java java-17-openjdk.aarch64; \ fi && \