Skip to content

Commit 10e3f53

Browse files
committed
still failing but progress is being made
1 parent b5918e9 commit 10e3f53

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

image/base/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
1414
libbrotli-dev
1515

1616
FROM builder AS imagemagick_builder
17+
ARG DEBIAN_RELEASE
18+
ENV DEBIAN_RELEASE=${DEBIAN_RELEASE}
1719
ADD install-imagemagick /tmp/install-imagemagick
20+
RUN echo "deb http://deb.debian.org/debian ${DEBIAN_RELEASE}-backports main" > "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-backports.list"
1821
RUN /tmp/install-imagemagick
1922

2023
FROM builder AS nginx_builder
@@ -67,11 +70,11 @@ RUN --mount=type=tmpfs,target=/var/log \
6770
fonts-urw-base35 \
6871
# nginx runtime dependencies \
6972
nginx-common && \
73+
# more recent libheif version
74+
DEBIAN_FRONTEND=noninteractive apt-get -y install -t ${DEBIAN_RELEASE}-backports libheif1; \
7075
# install these without recommends to avoid pulling in e.g.
7176
# X11 libraries, mailutils
7277
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends git rsyslog logrotate cron ssh-client less; \
73-
# more recent libheif version
74-
DEBIAN_FRONTEND=noninteractive apt-get -y install -t bullseye-backports libheif1; \
7578
# postgres packages
7679
install -d /usr/share/postgresql-common/pgdg &&\
7780
curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc &&\

image/base/install-imagemagick

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22
set -e
33

4+
cat /etc/apt/sources.list.d/bookworm-backports.list
5+
46
# version check: https://github.com/ImageMagick/ImageMagick/releases
57
IMAGE_MAGICK_VERSION="7.1.1-43"
68
IMAGE_MAGICK_HASH="ceb972266b23dc7c1cfce0da5a7f0c9acfb4dc81f40eb542a49476fedbc2618f"
@@ -16,14 +18,14 @@ apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
1618
libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
1719
libpng16-16 libpng-dev libwebp-dev libgomp1 \
1820
libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
19-
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev
21+
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
2022

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
23+
if cat /etc/issue | grep -qi Debian; then
24+
# Use backports
25+
. /etc/os-release
26+
apt -y -q install -t $VERSION_CODENAME-backports libaom-dev libheif1 libheif-dev
2427
else
25-
# Use backports instead of compiling it
26-
apt -y -q install -t bullseye-backports libaom-dev
28+
apt -y -q install libaom-dev libheif1 libheif-dev
2729
fi
2830

2931
mkdir -p $WDIR

0 commit comments

Comments
 (0)