discourse
/
discourse_docker
mirror of https://github.com/discourse/discourse_docker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Use more recent version of libheif (#943)

This commit is contained in:
Jarek Radosz 2025-02-26 01:17:03 +01:00 committed by GitHub
parent 375bcf1675
commit 78e8b2a4cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
image/base/Dockerfile
View File

@ -2,7 +2,11 @@
# VERSION: release # VERSION: release
ARG DEBIAN_RELEASE=bookworm ARG DEBIAN_RELEASE=bookworm
FROM discourse/ruby:3.3.6-${DEBIAN_RELEASE}-slim AS builder FROM discourse/ruby:3.3.6-${DEBIAN_RELEASE}-slim AS builder
ARG DEBIAN_RELEASE
ENV DEBIAN_RELEASE=${DEBIAN_RELEASE}
RUN echo "deb http://deb.debian.org/debian ${DEBIAN_RELEASE}-backports main" > "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-backports.list"
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install wget \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget \
autoconf build-essential \ autoconf build-essential \
@ -62,9 +66,9 @@ RUN --mount=type=tmpfs,target=/var/log \
libtcmalloc-minimal4 cmake \ libtcmalloc-minimal4 cmake \
pngcrush pngquant ripgrep poppler-utils \ pngcrush pngquant ripgrep poppler-utils \
# imagemagick runtime dependencies # imagemagick runtime dependencies
libheif1 libjbig0 libtiff6 libpng16-16 libfontconfig1 \ libjbig0 libtiff6 libpng16-16 libfontconfig1 \
libwebpdemux2 libwebpmux3 libxext6 librsvg2-2 libgomp1 \ libwebpdemux2 libwebpmux3 libxext6 librsvg2-2 libgomp1 \
fonts-urw-base35 \ fonts-urw-base35 libheif1/${DEBIAN_RELEASE}-backports \
# nginx runtime dependencies \ # nginx runtime dependencies \
nginx-common && \ nginx-common && \
# install these without recommends to avoid pulling in e.g. # install these without recommends to avoid pulling in e.g.

15
image/base/install-imagemagick
View File

@ -14,16 +14,17 @@ WDIR=/tmp/imagemagick
apt -y -q remove imagemagick apt -y -q remove imagemagick
apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \ apt -y -q install git make gcc pkg-config autoconf curl g++ yasm cmake \
libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \ libde265-0 libde265-dev ${LIBJPEGTURBO} libwebp7 x265 libx265-dev libtool \
libpng16-16 libpng-dev libwebp-dev libgomp1 \ libpng16-16 libpng-dev libwebp-dev libgomp1 libaom-dev \
libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \ libwebpmux3 libwebpdemux2 ghostscript libxml2-dev libxml2-utils librsvg2-dev \
libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev libheif1 libheif-dev libltdl7-dev libbz2-dev gsfonts libtiff-dev libfreetype6-dev libjpeg-dev
# Ubuntu doesn't like backports if cat /etc/issue | grep -qi Debian; then
if cat /etc/issue | grep -qiE 'Debian GNU/Linux 12|Ubuntu 22'; then # Get VERSION_CODENAME
apt -y install libaom-dev . /etc/os-release
# Use backports
apt -y -q install libheif1/$VERSION_CODENAME-backports libheif-dev/$VERSION_CODENAME-backports
else else
# Use backports instead of compiling it apt -y -q install libheif1 libheif-dev
apt -y -q install -t bullseye-backports libaom-dev
fi fi
mkdir -p $WDIR mkdir -p $WDIR