ACS-8370 Switch to new tags for java base image (#987)

* ACS-8370 Switch to new tags for java base images in Dockerfiles

* ACS-8370 Switch to new tags for java base images in Dockerfiles

* ACS-8370 Fix dependabot

* ACS-8370 Update

* ACS-8370 Update

* ACS-8370 Update

* ACS-8370 Update aio

* ACS-8370 Update aio

* ACS-8370 Enable verbose

* ACS-8370 Update url

* ACS-8370 Install procps

* ACS-8370 Install procps

* Revert "ACS-8370 Enable verbose"

This reverts commit b38344e11d.

* ACS-8370 Update alfresco-base-java sha

* ACS-8370 Fix libreoffice engine image
This commit is contained in:
Damian Ujma
2024-08-07 09:51:05 +02:00
committed by GitHub
parent 5e7f7b8f72
commit 3c46ac2284
8 changed files with 32 additions and 25 deletions

View File

@@ -2,12 +2,13 @@
# ImageMagick is from ImageMagick Studio LLC. See the license at http://www.imagemagick.org/script/license.php or in /ImageMagick-license.txt.
FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108
# More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1f6cc5acfe73b3dc80b0f3850c23a171d13ae1693a09ba32d7f8e0c71800116a
# For other ImageMagick versions please look at https://github.com/Alfresco/imagemagick-build tags
ARG IMAGEMAGICK_VERSION=7.1.0-16
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-3/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-3
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}-ci-10/imagemagick-distribution-${IMAGEMAGICK_VERSION}-ci-10
ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
ENV JAVA_OPTS=""
@@ -22,9 +23,9 @@ COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin
RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \
yum install -y $IMAGEMAGICK_DEP_RPM_URL && \
if [ "$(uname -m)" = "x86_64" ]; then \
yum install -y ${IMAGEMAGICK_RPM_URL}-el8.rpm ${IMAGEMAGICK_RPM_URL}-el8-libs.rpm; \
yum install -y ${IMAGEMAGICK_RPM_URL}-el9.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9.rpm; \
else \
yum install -y ${IMAGEMAGICK_RPM_URL}-arm64.rpm ${IMAGEMAGICK_RPM_URL}-arm64-libs.rpm; \
yum install -y ${IMAGEMAGICK_RPM_URL}-el9-aarch64.rpm ${IMAGEMAGICK_RPM_URL}-libs-el9-aarch64.rpm; \
fi && \
yum clean all