From ffd07b43a2c0feae0f3920968be0ffedc2810bd4 Mon Sep 17 00:00:00 2001 From: mstrankowski Date: Mon, 1 Aug 2022 12:20:50 +0200 Subject: [PATCH] Comments cleanup, removing centos7 rpm generating directory --- .../Dockerfile | 2 +- .../README.md | 16 -------- .../scripts/build-rpms.sh | 38 ------------------- .../scripts/build-rpms.sh | 2 +- .../alfresco-transform-tika-boot/Dockerfile | 2 +- 5 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md delete mode 100644 alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh 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 6cd2356d..8fec30b1 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile @@ -31,6 +31,7 @@ ARG USERID=33017 COPY target/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr/bin +#removing perl-ExtUtils-MakeMaker cascades to remove exiftools 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_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \ @@ -53,7 +54,6 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr make test && \ make install) && \ yum -y autoremove make && \ - #TODO removing perl-ExtUtils-MakeMaker removes exifTools rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \ yum clean all diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md deleted file mode 100644 index 09b2feab..00000000 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# How to create ImageMagick RPM packages for CentOS 7 -1. `cd` to this directory -2. Use CentOS 7 base image and execute the [build-rpms.sh](scripts/build-rpms.sh) script - -```bash -docker run -it --rm -v `pwd`:/opt/alfresco/imagemagick alfresco/alfresco-base-java:11.0.13-centos-7@sha256:c1e399d1bbb5d08e0905f1a9ef915ee7c5ea0c0ede11cc9bd7ca98532a9b27fa /bin/bash /opt/alfresco/imagemagick/scripts/build-rpms.sh -``` - -> **Note:** If you want to know more details or need to upgrade the ImageMagick version please check the comments in the [build-rpms.sh](scripts/build-rpms.sh) file - -3. RPMs will be created in the `rpms` directory - -```bash -bash-3.2$ ls rpms -ImageMagick-7.0.10-59.x86_64.centos7.rpm ImageMagick-libs-7.0.10-59.x86_64.centos7.rpm -``` \ No newline at end of file diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh deleted file mode 100644 index ac00910e..00000000 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -set -e - -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 - -#liblqr is not available on CentOS 7. Removing it from the spec. -sed -i '/lqr/d' ~/rpmbuild/SPECS/ImageMagick.spec - -#We need some libraries from the epel repo. -yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - -#We are going to compile the imagemagick so we need development tools. -yum -y group install "Development Tools" - -#We are building the imagemagick from the official SRPM package. It allows us to be as compatible with the official RPM packages as possible. -# Installing direct build time dependencies (excluding liblqr-1-devel) -yum -y install bzip2-devel freetype-devel libjpeg-devel libpng-devel libtiff-devel giflib-devel \ - zlib-devel perl-devel perl-generators ghostscript-devel djvulibre-devel libwmf-devel jasper-devel \ - libtool-ltdl-devel libX11-devel libXext-devel libXt-devel lcms2-devel libxml2-devel librsvg2-devel \ - fftw-devel ilmbase-devel OpenEXR-devel libwebp-devel jbigkit-devel openjpeg2-devel graphviz-devel \ - libraqm-devel LibRaw-devel -# Installing indirect dependencies -# ImageMagick tests requite non default fonts -yum groupinstall -y "fonts" -# ImageMagick spec requires ldconfig_scriptlets macro -yum -y install epel-rpm-macros - -#Building binary RPM packages -rpmbuild -bb ~/rpmbuild/SPECS/ImageMagick.spec - -#Copy RPMs to well known directory. -mkdir -p /opt/alfresco/imagemagick/rpms -cp ~/rpmbuild/RPMS/x86_64/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-$IMAGEMAGICK_VERSION.x86_64.centos7.rpm -cp ~/rpmbuild/RPMS/x86_64/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.rpm /opt/alfresco/imagemagick/rpms/ImageMagick-libs-$IMAGEMAGICK_VERSION.x86_64.centos7.rpm \ No newline at end of file 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 1d37aee8..e5c05b69 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,7 +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 -#liblqr is not available on Rocky Linux 8 (same as CentOS 7). Removing it from the spec. +#liblqr is not available on Rocky Linux 8. 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-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile index f204ccb5..06c34fb3 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile @@ -18,6 +18,7 @@ ARG USERID=33004 COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin +#removing perl-ExtUtils-MakeMaker cascades to remove exiftools RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \ tar xzf ${EXIFTOOL_FOLDER}.tgz && \ @@ -28,7 +29,6 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ make test && \ make install) && \ yum -y autoremove make && \ - #TODO perl-ExtUtils-MakeMaker removal removes exiftools \ rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \ yum clean all