From 3dd1fdca56a173b20dd31eb6627b265d19ccb00a Mon Sep 17 00:00:00 2001 From: Ploc <391-ploc@users.noreply.framagit.org> Date: Fri, 18 Jun 2021 11:18:26 +0200 Subject: [PATCH] chore: use imagemagick package from alpine Use imagemagick package from alpine instead of rebuilding it from source. --- docker/build.sh | 4 +--- docker/install-imagemagick.sh | 40 ----------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 docker/install-imagemagick.sh diff --git a/docker/build.sh b/docker/build.sh index 1750c76..964ac57 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -2,11 +2,9 @@ set -eu -apk --update add perl libpq perl-crypt-rijndael perl-io-socket-ssl perl-net-ssleay su-exec shared-mime-info libressl +apk --update add perl libpq perl-crypt-rijndael perl-io-socket-ssl perl-net-ssleay su-exec shared-mime-info libressl imagemagick imagemagick-perlmagick sh $(dirname $0)/install-dev-env.sh -sh $(dirname $0)/install-imagemagick.sh - cpan notest Carton Config::FromHash carton install --without test diff --git a/docker/install-imagemagick.sh b/docker/install-imagemagick.sh deleted file mode 100644 index 5a4f73f..0000000 --- a/docker/install-imagemagick.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env sh - -# Instructions from https://imagemagick.org/script/perl-magick.php - -set -eu - -IM_VERSION=7.0.8-41 -SHA256_DIGEST=93f73a245c25194f757c075df9f2ec40010376200cc664c21646565b8690112c - -IM_DIR="ImageMagick-$IM_VERSION" -TARBALL="$IM_DIR.tar.gz" - -ORIG_DIR="$(pwd)" - -apk add libgomp libgcc libmagic \ - libjpeg libjpeg-turbo-dev \ - libpng libpng-dev \ - tiff tiff-dev \ - libwebp libwebp-dev - -mkdir -p /tmp/im-build -cd /tmp/im-build - -echo "$SHA256_DIGEST *$TARBALL" > SHA256SUM - -wget https://imagemagick.org/download/$TARBALL -O $TARBALL -sha256sum -c SHA256SUM - -tar xvf $TARBALL -cd $IM_DIR -./configure --with-perl --with-jpeg --with-png --with-tiff --with-webp -make -j$(nproc) -make install - -ldconfig /usr/local/lib -perl -MImage::Magick -le 'print Image::Magick->QuantumDepth' - -cd "$ORIG_DIR" -apk del libjpeg-turbo-dev libpng-dev tiff-dev libwebp-dev -rm -rf /tmp/im-build \ No newline at end of file