Skip to content

Commit 22f85a3

Browse files
mautz-et-tongmautz-et-tong
authored
Merge pull request #7 from wilma-digital/main
[INFRA] fix commands, bump versions
2 parents 235ed04 + 374f5cd commit 22f85a3

File tree

2 files changed

+54
-51
lines changed

2 files changed

+54
-51
lines changed

‎src/bookworm/src/Dockerfile‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY root /
44

55
## configure default environment stuff and file permissions
66
RUN set -xe; \
7-
chmod 755 /usr/local/bin/{docker-php-source-prepare,docker-entrypoint,docker-fpm-healthcheck,docker-php-ext-configure,docker-php-ext-enable,docker-php-ext-disable,docker-php-ext-disable,docker-php-ext-install,docker-php-pecl-install,docker-php-source,phpgosu}; \
7+
chmod 755 /usr/local/bin/*; \
88
mkdir /home/www-data; \
99
chmod 711 /home/www-data; \
1010
chown www-data:www-data /home/www-data; \
@@ -33,19 +33,19 @@ ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev
3333
ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
3434
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
3535

36-
ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
3736
ARG MOZJPEG_VERSION="4.1.1"
37+
ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
3838

3939
ARG TIFF_VERSION="4.6.0"
4040
ARG TIFF_EXTRA_CONFIGURE_ARGS=""
4141

4242
ARG WEBP_VERSION="1.4.0"
4343
ARG WEBP_EXTRA_CONFIGURE_ARGS=""
4444

45-
ARG IMAGICK_VERSION="7.1.1-36"
45+
ARG IMAGICK_VERSION="3.7.0"
4646
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
4747

48-
ARG OPENJPEG_VERSION="2.5.2"
48+
ARG OPENJPEG_VERSION="2.5.3"
4949

5050
## configure imagick and the dependencies
5151
RUN set -xe; \
@@ -54,56 +54,57 @@ RUN set -xe; \
5454
################################################
5555
## install mozjpeg
5656
################################################
57-
mkdir -p /tmp/mozjpeg; \
58-
cd /tmp/mozjpeg; \
59-
docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \
57+
mkdir -p /tmp/mozjpeg;
58+
WORKDIR /tmp/mozjpeg
59+
RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozjpeg/archive/refs/tags/v${MOZJPEG_VERSION}.tar.gz; \
6060
tar --strip 1 -xzf mozjpeg.tar.gz; \
6161
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
6262
make install prefix=/usr libdir=/usr/lib64 ; \
6363
################################################
6464
## install tiff
6565
################################################
66-
mkdir -p /tmp/tiff; \
67-
cd /tmp/tiff; \
68-
docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
66+
mkdir -p /tmp/tiff;
67+
WORKDIR /tmp/tiff
68+
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
6969
tar --strip 1 -xzf tiff.tar.gz; \
7070
./configure \
7171
--prefix=/usr \
7272
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
7373
; \
74-
make -j$(nproc); \
74+
make -j"$(nproc)"; \
7575
make install; \
7676
################################################
7777
## install webp
7878
################################################
79-
mkdir -p /tmp/libwebp; \
80-
cd /tmp/libwebp; \
81-
docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
79+
mkdir -p /tmp/libwebp;
80+
WORKDIR /tmp/libwebp
81+
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
8282
tar --strip 1 -xzf libwebp.tar.gz; \
8383
./configure \
8484
--prefix=/usr \
8585
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
8686
; \
87-
make -j$(nproc); \
87+
make -j"$(nproc)"; \
8888
make install; \
8989
################################################
9090
## install openjpeg
9191
################################################
92-
mkdir -p /tmp/openjpeg; \
93-
cd /tmp/openjpeg; \
94-
docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \
92+
mkdir -p /tmp/openjpeg;
93+
WORKDIR /tmp/openjpeg
94+
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; \
9595
tar --strip 1 -xzf openjpeg.tar.gz; \
96-
mkdir build; \
97-
cd build; \
98-
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
99-
make -j$(nproc); \
96+
mkdir build;
97+
WORKDIR /tmp/openjpeg/build
98+
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
99+
make -j"$(nproc)"; \
100100
make install; \
101+
make clean; \
101102
################################################
102103
## install imagick
103104
################################################
104-
mkdir -p /tmp/imagemagick; \
105-
cd /tmp/imagemagick; \
106-
docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \
105+
mkdir -p /tmp/imagemagick;
106+
WORKDIR /tmp/imagemagick
107+
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz/; \
107108
tar --strip 1 -xzf imagemagick.tar.gz; \
108109
./configure \
109110
--prefix=/usr \
@@ -118,6 +119,7 @@ RUN set -xe; \
118119
--with-modules \
119120
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
120121
; \
121-
make -j$(nproc); \
122+
make -j"$(nproc)"; \
122123
make install; \
124+
make clean; \
123125
/usr/local/bin/docker-layer-clean

‎src/bullseye/src/Dockerfile‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY root /
44

55
## configure default environment stuff and file permissions
66
RUN set -xe; \
7-
chmod 755 /usr/local/bin/{docker-php-source-prepare,docker-entrypoint,docker-fpm-healthcheck,docker-php-ext-configure,docker-php-ext-enable,docker-php-ext-disable,docker-php-ext-disable,docker-php-ext-install,docker-php-pecl-install,docker-php-source,phpgosu}; \
7+
chmod 755 /usr/local/bin/*; \
88
mkdir /home/www-data; \
99
chmod 711 /home/www-data; \
1010
chown www-data:www-data /home/www-data; \
@@ -42,10 +42,10 @@ ARG TIFF_EXTRA_CONFIGURE_ARGS=""
4242
ARG WEBP_VERSION="1.4.0"
4343
ARG WEBP_EXTRA_CONFIGURE_ARGS=""
4444

45-
ARG IMAGICK_VERSION="7.1.1-36"
45+
ARG IMAGICK_VERSION="3.7.0"
4646
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""
4747

48-
ARG OPENJPEG_VERSION="2.5.2"
48+
ARG OPENJPEG_VERSION="2.5.3"
4949

5050
## configure imagick and the dependencies
5151
RUN set -xe; \
@@ -54,56 +54,57 @@ RUN set -xe; \
5454
################################################
5555
## install mozjpeg
5656
################################################
57-
mkdir -p /tmp/mozjpeg; \
58-
cd /tmp/mozjpeg; \
59-
docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \
57+
mkdir -p /tmp/mozjpeg;
58+
WORKDIR /tmp/mozjpeg
59+
RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozjpeg/archive/refs/tags/v${MOZJPEG_VERSION}.tar.gz; \
6060
tar --strip 1 -xzf mozjpeg.tar.gz; \
6161
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
6262
make install prefix=/usr libdir=/usr/lib64 ; \
6363
################################################
6464
## install tiff
6565
################################################
66-
mkdir -p /tmp/tiff; \
67-
cd /tmp/tiff; \
68-
docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
66+
mkdir -p /tmp/tiff;
67+
WORKDIR /tmp/tiff
68+
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
6969
tar --strip 1 -xzf tiff.tar.gz; \
7070
./configure \
7171
--prefix=/usr \
7272
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
7373
; \
74-
make -j$(nproc); \
74+
make -j"$(nproc)"; \
7575
make install; \
7676
################################################
7777
## install webp
7878
################################################
79-
mkdir -p /tmp/libwebp; \
80-
cd /tmp/libwebp; \
81-
docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
79+
mkdir -p /tmp/libwebp;
80+
WORKDIR /tmp/libwebp
81+
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
8282
tar --strip 1 -xzf libwebp.tar.gz; \
8383
./configure \
8484
--prefix=/usr \
8585
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
8686
; \
87-
make -j$(nproc); \
87+
make -j"$(nproc)"; \
8888
make install; \
8989
################################################
9090
## install openjpeg
9191
################################################
92-
mkdir -p /tmp/openjpeg; \
93-
cd /tmp/openjpeg; \
94-
docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \
92+
mkdir -p /tmp/openjpeg;
93+
WORKDIR /tmp/openjpeg
94+
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; \
9595
tar --strip 1 -xzf openjpeg.tar.gz; \
96-
mkdir build; \
97-
cd build; \
98-
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
99-
make -j$(nproc); \
96+
mkdir build;
97+
WORKDIR /tmp/openjpeg/build
98+
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
99+
make -j"$(nproc)"; \
100100
make install; \
101+
make clean; \
101102
################################################
102103
## install imagick
103104
################################################
104-
mkdir -p /tmp/imagemagick; \
105-
cd /tmp/imagemagick; \
106-
docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \
105+
mkdir -p /tmp/imagemagick;
106+
WORKDIR /tmp/imagemagick
107+
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz/; \
107108
tar --strip 1 -xzf imagemagick.tar.gz; \
108109
./configure \
109110
--prefix=/usr \
@@ -118,6 +119,6 @@ RUN set -xe; \
118119
--with-modules \
119120
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
120121
; \
121-
make -j$(nproc); \
122+
make -j"$(nproc)"; \
122123
make install; \
123124
/usr/local/bin/docker-layer-clean

0 commit comments

Comments
 (0)