File tree Expand file tree Collapse file tree 2 files changed +14
-9
lines changed Expand file tree Collapse file tree 2 files changed +14
-9
lines changed Original file line number Diff line number Diff line change 22# VERSION: release
33
44ARG DEBIAN_RELEASE=bookworm
5+
56FROM discourse/ruby:3.3.6-${DEBIAN_RELEASE}-slim AS builder
7+ ARG DEBIAN_RELEASE
8+ ENV DEBIAN_RELEASE=${DEBIAN_RELEASE}
9+ RUN echo "deb http://deb.debian.org/debian ${DEBIAN_RELEASE}-backports main" > "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-backports.list"
610RUN apt update && \
711DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
812 autoconf build-essential \
@@ -62,9 +66,9 @@ RUN --mount=type=tmpfs,target=/var/log \
6266 libtcmalloc-minimal4 cmake \
6367 pngcrush pngquant ripgrep poppler-utils \
6468# imagemagick runtime dependencies
65- libheif1 libjbig0 libtiff6 libpng16-16 libfontconfig1 \
69+ libjbig0 libtiff6 libpng16-16 libfontconfig1 \
6670 libwebpdemux2 libwebpmux3 libxext6 librsvg2-2 libgomp1 \
67- fonts-urw-base35 \
71+ fonts-urw-base35 libheif1/${DEBIAN_RELEASE}-backports \
6872# nginx runtime dependencies \
6973 nginx-common && \
7074# install these without recommends to avoid pulling in e.g.
Original file line number Diff line number Diff line change @@ -14,16 +14,17 @@ WDIR=/tmp/imagemagick
1414apt -y -q remove imagemagick
1515apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
1616 libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
17- libpng16-16 libpng-dev libwebp-dev libgomp1 \
17+ libpng16-16 libpng-dev libwebp-dev libgomp1 libaom-dev \
1818 libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
19- libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev
19+ libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
2020
21- # Ubuntu doesn't like backports
22- if cat /etc/issue | grep -qiE ' Debian GNU/Linux 12|Ubuntu 22' ; then
23- apt -y install libaom-dev
21+ if cat /etc/issue | grep -qi Debian; then
22+ # Get VERSION_CODENAME
23+ . /etc/os-release
24+ # Use backports
25+ apt -y -q install libheif1/$VERSION_CODENAME -backports libheif-dev/$VERSION_CODENAME -backports
2426else
25- # Use backports instead of compiling it
26- apt -y -q install -t bullseye-backports libaom-dev
27+ apt -y -q install libheif1 libheif-dev
2728fi
2829
2930mkdir -p $WDIR
You can’t perform that action at this time.
0 commit comments