Skip to content

Commit 93906f1

Browse files
author
Gabe Pacuilla
authored
DEV: use consistent third-party installation method (#610)
* DEV: use consistent third-party installation method * FIX: slim base image build on aarch64
1 parent 8e1988c commit 93906f1

File tree

17 files changed

+107
-75
lines changed

17 files changed

+107
-75
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

image/base/install-imagemagick

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ WDIR=/tmp/imagemagick
1313

1414
# Install build deps
1515
apt -y -q remove imagemagick
16-
apt -y -q install git make gcc pkg-config autoconf curl g++ \
17-
yasm cmake \
16+
apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
1817
libde265-0 libde265-dev ${LIBJPEGTURBO} x265 libx265-dev libtool \
19-
libpng16-16 libpng-dev ${LIBJPEGTURBO} libwebp6 libwebp-dev libgomp1 libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils \
20-
libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
18+
libpng16-16 libpng-dev ${LIBJPEGTURBO} libwebp6 libwebp-dev libgomp1 \
19+
libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils \
20+
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
2121

2222
# Use backports instead of compiling it
2323
apt -y -q install -t bullseye-backports libheif1 libaom-dev libheif-dev
@@ -26,7 +26,7 @@ mkdir -p $WDIR
2626
cd $WDIR
2727

2828
# Build and install ImageMagick
29-
wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/$IMAGE_MAGICK_VERSION.tar.gz"
29+
wget -q -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/$IMAGE_MAGICK_VERSION.tar.gz"
3030
sha256sum $WDIR/ImageMagick.tar.gz
3131
echo "$IMAGE_MAGICK_HASH $WDIR/ImageMagick.tar.gz" | sha256sum -c
3232
IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
@@ -58,3 +58,6 @@ make all && make install
5858
cd $HOME
5959
rm -rf $WDIR
6060
ldconfig /usr/local/lib
61+
62+
# Validate ImageMagick install
63+
test $(convert -version | grep -o -e png -e tiff -e jpeg -e freetype -e heic -e webp | wc -l) -eq 6

0 commit comments

Comments
 (0)