mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-05-12 17:04:48 +00:00
Moving all images including AIO to rocky linux 8,
moving generated RPMs of ImageMagick to Nexus There is an issue to resolve on rocky linux where removal of perl-ExtUtils-MakeMaker removes exiftool - causes Tika tests to fail. Leaving it for tests
This commit is contained in:
parent
75b2fe58a1
commit
e78709631f
@ -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 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
|
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 IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||||
|
|
||||||
ARG LIBREOFFICE_VERSION=7.2.5
|
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 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 && \
|
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 $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 && \
|
yum install -y cairo cups-libs libSM libGLU && \
|
||||||
test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
|
test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
|
||||||
ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-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 && \
|
||||||
make test && \
|
make test && \
|
||||||
make install) && \
|
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
|
yum clean all
|
||||||
|
|
||||||
ADD target/generated-resources/licenses /licenses
|
ADD target/generated-resources/licenses /licenses
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -6,6 +6,8 @@ FROM alfresco/alfresco-base-java:jre11-rockylinux8-202207110835
|
|||||||
|
|
||||||
ARG IMAGEMAGICK_VERSION=7.1.0-16
|
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 IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||||
ENV JAVA_OPTS=""
|
ENV JAVA_OPTS=""
|
||||||
|
|
||||||
@ -17,12 +19,9 @@ ARG USERID=33002
|
|||||||
|
|
||||||
COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin
|
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 && \
|
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 $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
|
yum clean all
|
||||||
|
|
||||||
ADD target/generated-resources/licenses /licenses
|
ADD target/generated-resources/licenses /licenses
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -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.
|
#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
|
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 Rocky Linux 8 (same as CentOS 7). Removing it from the spec.
|
||||||
#liblqr is not available on CentOS 7. Removing it from the spec.
|
|
||||||
sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec
|
sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec
|
||||||
|
|
||||||
#We need some libraries from the epel repo.
|
#We need some libraries from the epel repo.
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# LibreOffice is from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt.
|
# 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
|
ARG LIBREOFFICE_VERSION=7.2.5
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Image provides a container in which to run miscellaneous transformations for Alfresco Content Services.
|
# 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=""
|
ENV JAVA_OPTS=""
|
||||||
|
|
||||||
|
@ -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.
|
# 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 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=""
|
ENV JAVA_OPTS=""
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Tika is from Apache. See the license at http://www.apache.org/licenses/LICENSE-2.0.
|
# 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_VERSION=12.25
|
||||||
ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}
|
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 && \
|
||||||
make test && \
|
make test && \
|
||||||
make install) && \
|
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
|
yum clean all
|
||||||
|
|
||||||
ADD target/generated-resources/licenses /licenses
|
ADD target/generated-resources/licenses /licenses
|
||||||
|
Loading…
x
Reference in New Issue
Block a user