Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INFRA] fix commands, bump versions #7

Merged
merged 3 commits into from
Jan 27, 2025
Merged

[INFRA] fix commands, bump versions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84bb4a
[INFRA] fix hadolint errors
mautz-et-tong Dec 21, 2024
efe15be
[INFRA] fix commands, bump versions
mautz-et-tong Jan 27, 2025
374f5cd
[INFRA] remove cd, replace with workdir
mautz-et-tong Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions src/bookworm/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY root /

## configure default environment stuff and file permissions
RUN set -xe; \
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}; \
chmod 755 /usr/local/bin/*; \
mkdir /home/www-data; \
chmod 711 /home/www-data; \
chown www-data:www-data /home/www-data; \
Expand Down Expand Up @@ -33,19 +33,19 @@ ARG IMAGICK_BUILD_REQUIREMENTS="curl cmake gcc libtool libedit-dev liblcms2-dev
ARG IMAGICK_BUILD_REQUIREMENTS_EXTRA=""
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""

ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""
ARG MOZJPEG_VERSION="4.1.1"
ARG MOZJPEG_EXTRA_CONFIGURE_ARGS=""

ARG TIFF_VERSION="4.6.0"
ARG TIFF_EXTRA_CONFIGURE_ARGS=""

ARG WEBP_VERSION="1.4.0"
ARG WEBP_EXTRA_CONFIGURE_ARGS=""

ARG IMAGICK_VERSION="7.1.1-36"
ARG IMAGICK_VERSION="3.7.0"
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""

ARG OPENJPEG_VERSION="2.5.2"
ARG OPENJPEG_VERSION="2.5.3"

## configure imagick and the dependencies
RUN set -xe; \
Expand All @@ -54,56 +54,57 @@ RUN set -xe; \
################################################
## install mozjpeg
################################################
mkdir -p /tmp/mozjpeg; \
cd /tmp/mozjpeg; \
docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \
mkdir -p /tmp/mozjpeg;
WORKDIR /tmp/mozjpeg
RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozjpeg/archive/refs/tags/v${MOZJPEG_VERSION}.tar.gz; \
tar --strip 1 -xzf mozjpeg.tar.gz; \
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
make install prefix=/usr libdir=/usr/lib64 ; \
################################################
## install tiff
################################################
mkdir -p /tmp/tiff; \
cd /tmp/tiff; \
docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
mkdir -p /tmp/tiff;
WORKDIR /tmp/tiff
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
tar --strip 1 -xzf tiff.tar.gz; \
./configure \
--prefix=/usr \
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
################################################
## install webp
################################################
mkdir -p /tmp/libwebp; \
cd /tmp/libwebp; \
docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
mkdir -p /tmp/libwebp;
WORKDIR /tmp/libwebp
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
tar --strip 1 -xzf libwebp.tar.gz; \
./configure \
--prefix=/usr \
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
################################################
## install openjpeg
################################################
mkdir -p /tmp/openjpeg; \
cd /tmp/openjpeg; \
docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \
mkdir -p /tmp/openjpeg;
WORKDIR /tmp/openjpeg
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; \
tar --strip 1 -xzf openjpeg.tar.gz; \
mkdir build; \
cd build; \
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
make -j$(nproc); \
mkdir build;
WORKDIR /tmp/openjpeg/build
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
make -j"$(nproc)"; \
make install; \
make clean; \
################################################
## install imagick
################################################
mkdir -p /tmp/imagemagick; \
cd /tmp/imagemagick; \
docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \
mkdir -p /tmp/imagemagick;
WORKDIR /tmp/imagemagick
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz/; \
tar --strip 1 -xzf imagemagick.tar.gz; \
./configure \
--prefix=/usr \
Expand All @@ -118,6 +119,7 @@ RUN set -xe; \
--with-modules \
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
make clean; \
/usr/local/bin/docker-layer-clean
51 changes: 26 additions & 25 deletions src/bullseye/src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY root /

## configure default environment stuff and file permissions
RUN set -xe; \
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}; \
chmod 755 /usr/local/bin/*; \
mkdir /home/www-data; \
chmod 711 /home/www-data; \
chown www-data:www-data /home/www-data; \
Expand Down Expand Up @@ -42,10 +42,10 @@ ARG TIFF_EXTRA_CONFIGURE_ARGS=""
ARG WEBP_VERSION="1.4.0"
ARG WEBP_EXTRA_CONFIGURE_ARGS=""

ARG IMAGICK_VERSION="7.1.1-36"
ARG IMAGICK_VERSION="3.7.0"
ARG IMAGICK_EXTRA_CONFIGURE_ARGS=""

ARG OPENJPEG_VERSION="2.5.2"
ARG OPENJPEG_VERSION="2.5.3"

## configure imagick and the dependencies
RUN set -xe; \
Expand All @@ -54,56 +54,57 @@ RUN set -xe; \
################################################
## install mozjpeg
################################################
mkdir -p /tmp/mozjpeg; \
cd /tmp/mozjpeg; \
docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \
mkdir -p /tmp/mozjpeg;
WORKDIR /tmp/mozjpeg
RUN docker-package-download -o mozjpeg.tar.gz -s https://github.com/mozilla/mozjpeg/archive/refs/tags/v${MOZJPEG_VERSION}.tar.gz; \
tar --strip 1 -xzf mozjpeg.tar.gz; \
cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DWITH_JPEG8=true; \
make install prefix=/usr libdir=/usr/lib64 ; \
################################################
## install tiff
################################################
mkdir -p /tmp/tiff; \
cd /tmp/tiff; \
docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
mkdir -p /tmp/tiff;
WORKDIR /tmp/tiff
RUN docker-package-download -o tiff.tar.gz -s http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz; \
tar --strip 1 -xzf tiff.tar.gz; \
./configure \
--prefix=/usr \
${TIFF_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
################################################
## install webp
################################################
mkdir -p /tmp/libwebp; \
cd /tmp/libwebp; \
docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
mkdir -p /tmp/libwebp;
WORKDIR /tmp/libwebp
RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz; \
tar --strip 1 -xzf libwebp.tar.gz; \
./configure \
--prefix=/usr \
${WEBP_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
################################################
## install openjpeg
################################################
mkdir -p /tmp/openjpeg; \
cd /tmp/openjpeg; \
docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \
mkdir -p /tmp/openjpeg;
WORKDIR /tmp/openjpeg
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; \
tar --strip 1 -xzf openjpeg.tar.gz; \
mkdir build; \
cd build; \
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
make -j$(nproc); \
mkdir build;
WORKDIR /tmp/openjpeg/build
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \
make -j"$(nproc)"; \
make install; \
make clean; \
################################################
## install imagick
################################################
mkdir -p /tmp/imagemagick; \
cd /tmp/imagemagick; \
docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \
mkdir -p /tmp/imagemagick;
WORKDIR /tmp/imagemagick
RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/Imagick/imagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz/; \
tar --strip 1 -xzf imagemagick.tar.gz; \
./configure \
--prefix=/usr \
Expand All @@ -118,6 +119,6 @@ RUN set -xe; \
--with-modules \
${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \
; \
make -j$(nproc); \
make -j"$(nproc)"; \
make install; \
/usr/local/bin/docker-layer-clean
Loading