diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile index c818075d..6cd2356d 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -12,6 +12,8 @@ ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} ARG EXIFTOOL_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/exiftool/image-exiftool/${EXIFTOOL_VERSION}/image-exiftool-${EXIFTOOL_VERSION}.tgz ARG IMAGEMAGICK_VERSION=7.1.0-16 +ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-rockylinux8.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-rockylinux8.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ARG LIBREOFFICE_VERSION=7.2.5 @@ -29,12 +31,9 @@ ARG USERID=33017 COPY target/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin -COPY rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm /usr/bin -COPY rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm /usr/bin - RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin/alfresco-transform-core-aio-boot.jar && \ yum install -y $IMAGEMAGICK_DEP_RPM_URL && \ - yum install -y /usr/bin/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm /usr/bin/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm && \ + yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ yum install -y cairo cups-libs libSM libGLU && \ test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \ ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \ @@ -53,7 +52,9 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr make && \ make test && \ make install) && \ - yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \ + yum -y autoremove make && \ + #TODO removing perl-ExtUtils-MakeMaker removes exifTools + rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \ yum clean all ADD target/generated-resources/licenses /licenses diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm deleted file mode 100644 index 42e3eaef..00000000 Binary files a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm and /dev/null differ diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm deleted file mode 100644 index 4e67af7d..00000000 Binary files a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm and /dev/null differ diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile index 22aa627a..8d489787 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile @@ -6,6 +6,8 @@ FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835 ARG IMAGEMAGICK_VERSION=7.1.0-16 +ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-rockylinux8.rpm +ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-rockylinux8.rpm ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ENV JAVA_OPTS="" @@ -17,12 +19,9 @@ ARG USERID=33002 COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -COPY rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm /usr/bin -COPY rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm /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 && \ - yum install -y /usr/bin/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm /usr/bin/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm && \ + yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ yum clean all ADD target/generated-resources/licenses /licenses diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm deleted file mode 100644 index 42e3eaef..00000000 Binary files a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-7.1.0-16.x86_64.rockylinux8.rpm and /dev/null differ diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm deleted file mode 100644 index 4e67af7d..00000000 Binary files a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/rpms/ImageMagick-libs-7.1.0-16.x86_64.rockylinux8.rpm and /dev/null differ diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-rockylinux8/scripts/build-rpms.sh b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-rockylinux8/scripts/build-rpms.sh index b71192dd..1d37aee8 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-rockylinux8/scripts/build-rpms.sh +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-rockylinux8/scripts/build-rpms.sh @@ -7,8 +7,7 @@ IMAGEMAGICK_VERSION=7.1.0-16 #Installing SRPM package. For future proof builds the SRPM package is uploaded to Alfresco's nexus repository. rpm -i https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/$IMAGEMAGICK_VERSION/imagemagick-distribution-$IMAGEMAGICK_VERSION-src.rpm -#TODO -#liblqr is not available on CentOS 7. Removing it from the spec. +#liblqr is not available on Rocky Linux 8 (same as CentOS 7). Removing it from the spec. sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec #We need some libraries from the epel repo. diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile index ca5a8f42..c3cfefe1 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/Dockerfile @@ -2,7 +2,7 @@ # LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt. -FROM alfresco/alfresco-base-java:jre11-centos7-202207110835 +FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835 ARG LIBREOFFICE_VERSION=7.2.5 diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile index 8e7432da..fed63bb0 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/Dockerfile @@ -1,6 +1,6 @@ # Image provides a container in which to run miscellaneous transformations for Alfresco Content Services. -FROM alfresco/alfresco-base-java:jre11-centos7-202207110835 +FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835 ENV JAVA_OPTS="" diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile index 601172b5..6045c94e 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/Dockerfile @@ -2,7 +2,7 @@ # alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt. -FROM alfresco/alfresco-base-java:jre11-centos7-202205121725 +FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV JAVA_OPTS="" diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index 8fb572b5..e2389b65 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile @@ -2,7 +2,7 @@ # Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0. -FROM alfresco/alfresco-base-java:jre11-centos7-202207110835 +FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835 ARG EXIFTOOL_VERSION=12.25 ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION} @@ -27,7 +27,9 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ make && \ make test && \ make install) && \ - yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \ + yum -y autoremove make && \ + #TODO perl-ExtUtils-MakeMaker removal removes exiftools + rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz #&& \ yum clean all ADD target/generated-resources/licenses /licenses