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:
mstrankowski
2022-07-29 17:56:54 +02:00
parent 75b2fe58a1
commit e78709631f
11 changed files with 17 additions and 16 deletions

View File

@@ -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

View File

@@ -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.