diff --git a/engines/imagemagick/Dockerfile b/engines/imagemagick/Dockerfile index e1cfa02a..c8949a6f 100644 --- a/engines/imagemagick/Dockerfile +++ b/engines/imagemagick/Dockerfile @@ -2,22 +2,29 @@ # # PRODMAN-916 / ACS-12649 PoC: this engine has been switched from the custom (capability-reduced) # ImageMagick build to GraphicsMagick, built here FROM SOURCE with a full delegate set, including: -# * JP2 / JPEG-2000 support via JasPer (--with-jp2, jasper-devel) -# * PSD (Adobe Photoshop) support via --enable-broken-coders -# Building from source (rather than the stock EPEL package) gives GraphicsMagick more capability than -# the distribution package: it adds the PSD coder, which distributions disable by default since -# GraphicsMagick 1.3.24. PDD (Adobe, PSD-structured) is handled by the same PSD coder via content -# (magic-byte) detection. +# * PSD (Adobe Photoshop) support via --enable-broken-coders. Distributions disable the PSD coder +# by default since GraphicsMagick 1.3.24, so building from source is the only way to get it. +# PDD (Adobe, PSD-structured) is handled by the same coder via content (magic-byte) detection. +# * JP2 / JPEG-2000 support via JasPer. jasper-devel is NOT packaged for RHEL/Rocky 9 (JasPer was +# dropped from RHEL 9 / EPEL 9), so JasPer is also built from source here. GraphicsMagick 1.3.48 +# targets the modern JasPer API (jas_init_library, JasPer 3.0.0+) and links cleanly against 4.x. +# +# WMF is disabled (--without-wmf) as libwmf is not available on the el9 base. # # GraphicsMagick is from the GraphicsMagick Group. See http://www.graphicsmagick.org/ . +# JasPer is from Michael D. Adams / the JasPer project. See https://github.com/jasper-software/jasper . # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java ARG JAVA_BASE_IMAGE=alfresco/alfresco-base-java:jre17-rockylinux9@sha256:f98833508b7be8c4b44a25450f9faac44cacfdc075f2295e02836b93fd05bb9c FROM ${JAVA_BASE_IMAGE} -# GraphicsMagick version to build from source. +# Versions built from source. ARG GRAPHICSMAGICK_VERSION=1.3.48 +ARG JASPER_VERSION=4.2.9 +ENV GRAPHICSMAGICK_VERSION=${GRAPHICSMAGICK_VERSION} +ENV JASPER_VERSION=${JASPER_VERSION} ENV GRAPHICSMAGICK_SRC_URL=https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${GRAPHICSMAGICK_VERSION}/GraphicsMagick-${GRAPHICSMAGICK_VERSION}.tar.xz +ENV JASPER_SRC_URL=https://github.com/jasper-software/jasper/archive/refs/tags/version-${JASPER_VERSION}.tar.gz ENV JAVA_OPTS="" # Set default user information @@ -28,17 +35,32 @@ ARG USERID=33002 COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin -# Build GraphicsMagick from source with a full delegate set + PSD support (--enable-broken-coders). +# Build JasPer (JP2) then GraphicsMagick (with PSD via --enable-broken-coders) from source. +# NOTE: no '#' comments inside this RUN chain - a comment after a line continuation would swallow +# the rest of the command. RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ dnf install -y dnf-plugins-core && \ (dnf config-manager --set-enabled crb || true) && \ - dnf groupinstall -y "Development Tools" && \ dnf install -y \ - gcc gcc-c++ make tar xz curl diffutils \ + gcc gcc-c++ make cmake tar xz gzip curl diffutils gawk file \ libjpeg-turbo-devel libpng-devel libtiff-devel libwebp-devel \ - freetype-devel libxml2-devel lcms2-devel bzip2-devel zlib-devel \ - jasper-devel && \ + freetype-devel libxml2-devel lcms2-devel bzip2-devel zlib-devel && \ + cd /tmp && \ + curl -fSL --retry 3 --retry-delay 5 "${JASPER_SRC_URL}" -o jasper.tar.gz && \ + tar -xzf jasper.tar.gz && \ + cmake -S jasper-version-${JASPER_VERSION} -B jasper-build \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_BUILD_TYPE=Release \ + -DJAS_ENABLE_SHARED=ON \ + -DJAS_ENABLE_DOC=OFF \ + -DJAS_ENABLE_PROGRAMS=OFF \ + -DJAS_ENABLE_OPENGL=OFF \ + -DJAS_ENABLE_LIBJPEG=OFF && \ + cmake --build jasper-build --parallel "$(nproc)" && \ + cmake --install jasper-build && \ + printf '/usr/local/lib\n/usr/local/lib64\n' > /etc/ld.so.conf.d/local.conf && \ + ldconfig && \ cd /tmp && \ curl -fSL --retry 3 --retry-delay 5 "${GRAPHICSMAGICK_SRC_URL}" -o GraphicsMagick-${GRAPHICSMAGICK_VERSION}.tar.xz && \ tar -xJf GraphicsMagick-${GRAPHICSMAGICK_VERSION}.tar.xz && \ @@ -51,12 +73,17 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${ --with-jpeg --with-png --with-tiff --with-webp \ --with-jp2 \ --with-ttf --with-lcms2 --with-xml \ - --with-zlib --with-bzlib && \ + --with-zlib --with-bzlib \ + --without-wmf \ + CPPFLAGS="-I/usr/local/include" \ + LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib" && \ make -j"$(nproc)" && \ make install && \ - echo "/usr/local/lib" > /etc/ld.so.conf.d/graphicsmagick.conf && \ ldconfig && \ - cd /tmp && rm -rf GraphicsMagick-${GRAPHICSMAGICK_VERSION} GraphicsMagick-${GRAPHICSMAGICK_VERSION}.tar.xz && \ + /usr/local/bin/gm version && \ + /usr/local/bin/gm convert -list format | grep -qi 'jp2' && \ + /usr/local/bin/gm convert -list format | grep -qi 'psd' && \ + cd /tmp && rm -rf GraphicsMagick-${GRAPHICSMAGICK_VERSION} GraphicsMagick-${GRAPHICSMAGICK_VERSION}.tar.xz jasper-version-${JASPER_VERSION} jasper-build jasper.tar.gz && \ dnf clean all && rm -rf /var/cache/dnf ADD target/generated-resources/licenses /licenses