Skip to content

Commit 6bd6392

Browse files
mautz-et-tongmautz-et-tong
committed
[INFRA] revert some recent changes and bump versions
1 parent b720bc7 commit 6bd6392

File tree

2 files changed

+112
-20
lines changed

2 files changed

+112
-20
lines changed

‎src/bookworm/src/Dockerfile

+56-10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ RUN set -xe; \
1010
chown www-data:www-data /home/www-data; \
1111
usermod -d /home/www-data www-data; \
1212
\
13+
## block packages from being installed
14+
{ \
15+
echo 'Package: libjpeg*'; \
16+
echo 'Pin: release *'; \
17+
echo 'Pin-Priority: -1'; \
18+
} > /etc/apt/preferences.d/no-libjpeg; \
1319
{ \
1420
echo 'Package: libtiff*'; \
1521
echo 'Pin: release *'; \
@@ -23,18 +29,20 @@ RUN set -xe; \
2329

2430
ARG IMAGICK_RUNTIME_REQUIREMENTS="libpng16-16 liblcms2-2 libgomp1 libltdl7 bzip2 gosu brotli"
2531
ARG IMAGICK_RUNTIME_REQUIREMENTS_EXTRA=""
26-
ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev build-essential autoconf automake pkg-config libpng-dev libjpeg-dev libltdl-dev nasm"
32+
ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev build-essential autoconf automake pkg-config libpng-dev libltdl-dev nasm"
33+
ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
34+
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
2735

2836
ARG MOZJPEG_VERSION="4.1.1"
2937
ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
3038

31-
ARG TIFF_VERSION="4.6.0"
39+
ARG TIFF_VERSION="4.7.0"
3240
ARG TIFF_EXTRA_CONFIGURE_ARGS=""
3341

34-
ARG WEBP_VERSION="1.4.0"
42+
ARG WEBP_VERSION="1.5.0"
3543
ARG WEBP_EXTRA_CONFIGURE_ARGS=""
3644

37-
ARG IMAGICK_VERSION="3.7.0"
45+
ARG IMAGICK_VERSION="7.1.1-44"
3846
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
3947

4048
ARG OPENJPEG_VERSION="2.5.3"
@@ -56,21 +64,59 @@ RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozj
5664
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
5765
make install prefix=/usr libdir=/usr/lib64;
5866
################################################
67+
## install tiff
68+
################################################
69+
WORKDIR /tmp/tiff
70+
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
71+
tar --strip 1 -xzf tiff.tar.gz; \
72+
./configure \
73+
--prefix=/usr \
74+
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
75+
; \
76+
make -j"$(nproc)"; \
77+
make install;
78+
################################################
79+
## install webp
80+
################################################
81+
WORKDIR /tmp/libwebp
82+
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
83+
tar --strip 1 -xzf libwebp.tar.gz; \
84+
./configure \
85+
--prefix=/usr \
86+
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
87+
; \
88+
make -j"$(nproc)"; \
89+
make install;
90+
################################################
5991
## install openjpeg
6092
################################################
6193
WORKDIR /tmp/openjpeg
62-
RUN docker-package-download -o openjpeg.tar.gz -s https://github.com/uclouvain/openjpeg/releases/download/v${OPENJPEG_VERSION}/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz; \
94+
RUN docker-package-download -o openjpeg.tar.gz -s https://github.com/uclouvain/openjpeg/archive/refs/tags/v${OPENJPEG_VERSION}.tar.gz; \
6395
tar --strip 1 -xzf openjpeg.tar.gz; \
6496
mkdir build;
6597
WORKDIR /tmp/openjpeg/build
6698
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
6799
make -j"$(nproc)"; \
68-
make install; \
69-
make clean; \
100+
make install;
70101
################################################
71102
## install imagick
72103
################################################
73-
# hadolint ignore=DL3008
74-
RUN apt-get update && \
75-
apt-get install -y imagemagick libmagickwand-dev; \
104+
WORKDIR /tmp/imagemagick
105+
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz; \
106+
tar --strip 1 -xzf imagemagick.tar.gz; \
107+
./configure \
108+
--prefix=/usr \
109+
--with-webp \
110+
--without-perl \
111+
--without-x \
112+
--without-xml \
113+
--without-pango \
114+
--without-jbig \
115+
--without-wmf \
116+
--with-perl=no \
117+
--with-modules \
118+
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
119+
; \
120+
make -j"$(nproc)"; \
121+
make install; \
76122
/usr/local/bin/docker-layer-clean

‎src/bullseye/src/Dockerfile

+56-10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ RUN set -xe; \
1010
chown www-data:www-data /home/www-data; \
1111
usermod -d /home/www-data www-data; \
1212
\
13+
## block packages from being installed
14+
{ \
15+
echo 'Package: libjpeg*'; \
16+
echo 'Pin: release *'; \
17+
echo 'Pin-Priority: -1'; \
18+
} > /etc/apt/preferences.d/no-libjpeg; \
1319
{ \
1420
echo 'Package: libtiff*'; \
1521
echo 'Pin: release *'; \
@@ -23,18 +29,20 @@ RUN set -xe; \
2329

2430
ARG IMAGICK_RUNTIME_REQUIREMENTS="libpng16-16 liblcms2-2 libgomp1 libltdl7 bzip2 gosu brotli"
2531
ARG IMAGICK_RUNTIME_REQUIREMENTS_EXTRA=""
26-
ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev build-essential autoconf automake pkg-config libpng-dev libjpeg-dev libltdl-dev nasm"
32+
ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev build-essential autoconf automake pkg-config libpng-dev libltdl-dev nasm"
33+
ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
34+
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
2735

2836
ARG MOZJPEG_VERSION="4.1.1"
2937
ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
3038

31-
ARG TIFF_VERSION="4.6.0"
39+
ARG TIFF_VERSION="4.7.0"
3240
ARG TIFF_EXTRA_CONFIGURE_ARGS=""
3341

34-
ARG WEBP_VERSION="1.4.0"
42+
ARG WEBP_VERSION="1.5.0"
3543
ARG WEBP_EXTRA_CONFIGURE_ARGS=""
3644

37-
ARG IMAGICK_VERSION="3.7.0"
45+
ARG IMAGICK_VERSION="7.1.1-44"
3846
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
3947

4048
ARG OPENJPEG_VERSION="2.5.3"
@@ -56,21 +64,59 @@ RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozj
5664
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
5765
make install prefix=/usr libdir=/usr/lib64;
5866
################################################
67+
## install tiff
68+
################################################
69+
WORKDIR /tmp/tiff
70+
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
71+
tar --strip 1 -xzf tiff.tar.gz; \
72+
./configure \
73+
--prefix=/usr \
74+
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
75+
; \
76+
make -j"$(nproc)"; \
77+
make install;
78+
################################################
79+
## install webp
80+
################################################
81+
WORKDIR /tmp/libwebp
82+
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
83+
tar --strip 1 -xzf libwebp.tar.gz; \
84+
./configure \
85+
--prefix=/usr \
86+
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
87+
; \
88+
make -j"$(nproc)"; \
89+
make install;
90+
################################################
5991
## install openjpeg
6092
################################################
6193
WORKDIR /tmp/openjpeg
62-
RUN docker-package-download -o openjpeg.tar.gz -s https://github.com/uclouvain/openjpeg/releases/download/v${OPENJPEG_VERSION}/openjpeg-v${OPENJPEG_VERSION}-linux-x86_64.tar.gz; \
94+
RUN docker-package-download -o openjpeg.tar.gz -s https://github.com/uclouvain/openjpeg/archive/refs/tags/v${OPENJPEG_VERSION}.tar.gz; \
6395
tar --strip 1 -xzf openjpeg.tar.gz; \
6496
mkdir build;
6597
WORKDIR /tmp/openjpeg/build
6698
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
6799
make -j"$(nproc)"; \
68-
make install; \
69-
make clean; \
100+
make install;
70101
################################################
71102
## install imagick
72103
################################################
73-
# hadolint ignore=DL3008
74-
RUN apt-get update && \
75-
apt-get install -y imagemagick libmagickwand-dev; \
104+
WORKDIR /tmp/imagemagick
105+
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz; \
106+
tar --strip 1 -xzf imagemagick.tar.gz; \
107+
./configure \
108+
--prefix=/usr \
109+
--with-webp \
110+
--without-perl \
111+
--without-x \
112+
--without-xml \
113+
--without-pango \
114+
--without-jbig \
115+
--without-wmf \
116+
--with-perl=no \
117+
--with-modules \
118+
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
119+
; \
120+
make -j"$(nproc)"; \
121+
make install; \
76122
/usr/local/bin/docker-layer-clean

0 commit comments

Comments
 (0)