WIP

bin/test

@@ -10,7 +10,7 @@ function indent() {
   esac
 }
 
-ls -lahR /app/vendor/imagemagick/lib | indent
+ls -lah /app/vendor/imagemagick/lib | indent
 
 magick -list configure | indent
 # magick -resize 100 fixtures/test.avif fixtures/test-resize.avif | indent

build.sh

@@ -15,7 +15,8 @@ STACK_VERSIONS=(24)
 for stack_version in "${STACK_VERSIONS[@]}"; do
   image_name="heroku-imagemagick-stack-$stack_version"
 
-  docker --debug build \
+  docker build \
+    --no-cache \
     --platform linux/amd64 \
     --build-arg STACK_VERSION=${stack_version} \
     --tag $image_name \

build/configurations/heroku-24.config.log

@@ -8,7 +8,7 @@ CC                    gcc
 CFLAGS                -I/usr/include/libxml2 -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include/webp -I/usr/include/libpng16 -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/openjpeg-2.5 -I/usr/local/include -I/usr/local/include/webp -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -pthread -fopenmp -Wall -g -O2 -mtune=westmere -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32
 CHANNEL_MASK_DEPTH    32
 CODER_PATH            /usr/local/lib/ImageMagick-7.1.1/modules-Q16HDRI/coders
-CONFIGURE             ./configure  '--prefix=/usr/local' '--without-magick-plus-plus' '--disable-docs' '--disable-static' '--with-heic=yes' '--with-webp=yes' '--with-tiff=yes' '--with-x=no' '--with-zip=no' '--with-gvc=no' '--with-openexr=no' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig'
+CONFIGURE             ./configure  '--prefix=/usr/local' '--without-magick-plus-plus' '--disable-docs' '--disable-static' '--with-libdeflate=no' '--with-heic=yes' '--with-webp=yes' '--with-tiff=yes' '--with-x=no' '--with-zip=no' '--with-gvc=no' '--with-openexr=no' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig'
 CONFIGURE_PATH        /usr/local/etc/ImageMagick-7/
 COPYRIGHT             Copyright (C) 1999 ImageMagick Studio LLC
 CPPFLAGS              -I/usr/local/include/ImageMagick-7

container/Dockerfile

@@ -54,7 +54,7 @@ RUN set -ex \
   && cmake --preset=release-noplugins -DCMAKE_INSTALL_PREFIX=$PREFIX -DWITH_EXAMPLES=OFF .. \ 
   && make -j$(nproc) \
   && make install \
-  && ldconfig /usr/local/lib \
+  && ldconfig \
   && rm -rf /usr/local/src/libheif
 
 # Build and install libtiff
@@ -66,19 +66,21 @@ RUN set -ex \
   && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=$PREFIX ../ \
   && make -j$(nproc) \
   && make install \
-  && ldconfig /usr/local/lib \
+  && ldconfig \
   && rm -rf /usr/local/src/libtiff
 
 # Build and install ImageMagick
 RUN set -ex \
   && mkdir -p imagemagick \
   && cd imagemagick \
   && curl -sSL "https://api.github.com/repos/ImageMagick/ImageMagick/tarball/${COMPILE_VERSION_IMAGEMAGICK}" | tar zx --strip-components=1 \
-  && ./configure --prefix=$PREFIX --without-magick-plus-plus --disable-docs --disable-static --with-heic=yes --with-webp=yes --with-tiff=yes --with-openexr=no --with-x=no --with-zip=no --with-gvc=no --with-openexr=no \
+  && ./configure --prefix=$PREFIX --without-magick-plus-plus --disable-docs --disable-static --with-libdeflate=no --with-heic=yes --with-webp=yes --with-tiff=yes --with-openexr=no --with-x=no --with-zip=no --with-gvc=no --with-openexr=no \
   && make -j$(nproc) \
   && make install \
-  && ldconfig /usr/local/lib \
-  && rm -rf /usr/local/src/imagemagick
+  && ldconfig
+
+# Update ldconfig cache
+RUN ldconfig
 
 # Clean and package
 RUN set -ex \
@@ -89,9 +91,6 @@ RUN set -ex \
   && mkdir -p build \
   && tar cjf "build/heroku-$STACK_VERSION.tar.bz2" bin include lib etc share
 
-# Update ldconfig cache
-RUN ldconfig
-
 # Store configuration for easy viewing in the repo
 RUN set -ex \
   && cd $PREFIX \