From f84bb4aee4d802dbf4c7db83d1b39b377fc58db5 Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Sat, 21 Dec 2024 12:32:48 +0100 Subject: [PATCH 1/3] [INFRA] fix hadolint errors --- src/bookworm/src/Dockerfile | 40 ++++++++++++++++++------------------- src/bullseye/src/Dockerfile | 38 +++++++++++++++++------------------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/bookworm/src/Dockerfile b/src/bookworm/src/Dockerfile index 8115224..f9a62fc 100644 --- a/src/bookworm/src/Dockerfile +++ b/src/bookworm/src/Dockerfile @@ -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; \ @@ -33,8 +33,8 @@ 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="" @@ -54,56 +54,56 @@ 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://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \ 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://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \ tar --strip 1 -xzf openjpeg.tar.gz; \ mkdir build; \ cd build; \ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \ - make -j$(nproc); \ + make -j"$(nproc)"; \ make install; \ ################################################ ## 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}; \ +WORKDIR /tmp/imagemagick +RUN docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \ tar --strip 1 -xzf imagemagick.tar.gz; \ ./configure \ --prefix=/usr \ @@ -118,6 +118,6 @@ RUN set -xe; \ --with-modules \ ${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \ ; \ - make -j$(nproc); \ + make -j"$(nproc)"; \ make install; \ /usr/local/bin/docker-layer-clean diff --git a/src/bullseye/src/Dockerfile b/src/bullseye/src/Dockerfile index b89cd45..f6d8614 100644 --- a/src/bullseye/src/Dockerfile +++ b/src/bullseye/src/Dockerfile @@ -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; \ @@ -54,56 +54,56 @@ 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://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \ 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://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \ tar --strip 1 -xzf openjpeg.tar.gz; \ mkdir build; \ cd build; \ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \ - make -j$(nproc); \ + make -j"$(nproc)"; \ make install; \ ################################################ ## 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}; \ +WORKDIR /tmp/imagemagick +RUN docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \ tar --strip 1 -xzf imagemagick.tar.gz; \ ./configure \ --prefix=/usr \ @@ -118,6 +118,6 @@ RUN set -xe; \ --with-modules \ ${IMAGICK_EXTRA_CONFIGURE_ARGS:-} \ ; \ - make -j$(nproc); \ + make -j"$(nproc)"; \ make install; \ /usr/local/bin/docker-layer-clean From efe15bea635631cd9433f3287c25c3429b59fa6e Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Mon, 27 Jan 2025 12:05:56 +0100 Subject: [PATCH 2/3] [INFRA] fix commands, bump versions --- src/bookworm/src/Dockerfile | 15 ++++++++------- src/bullseye/src/Dockerfile | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/bookworm/src/Dockerfile b/src/bookworm/src/Dockerfile index f9a62fc..3b67857 100644 --- a/src/bookworm/src/Dockerfile +++ b/src/bookworm/src/Dockerfile @@ -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; \ @@ -56,7 +56,7 @@ RUN set -xe; \ ################################################ mkdir -p /tmp/mozjpeg; WORKDIR /tmp/mozjpeg -RUN docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \ +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 ; \ @@ -89,21 +89,22 @@ RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/ ################################################ ## install openjpeg ################################################ - mkdir -p /tmp/openjpeg + mkdir -p /tmp/openjpeg; WORKDIR /tmp/openjpeg -RUN docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \ +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)"; \ make install; \ + make clean; \ ################################################ ## install imagick ################################################ - mkdir -p /tmp/imagemagick; \ + mkdir -p /tmp/imagemagick; WORKDIR /tmp/imagemagick -RUN docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \ +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 \ diff --git a/src/bullseye/src/Dockerfile b/src/bullseye/src/Dockerfile index f6d8614..34b4e73 100644 --- a/src/bullseye/src/Dockerfile +++ b/src/bullseye/src/Dockerfile @@ -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; \ @@ -56,7 +56,7 @@ RUN set -xe; \ ################################################ mkdir -p /tmp/mozjpeg; WORKDIR /tmp/mozjpeg -RUN docker-package-download -o mozjpeg.tar.gz -s https://codeload.github.com/mozilla/mozjpeg/tar.gz/v${MOZJPEG_VERSION}; \ +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 ; \ @@ -89,21 +89,22 @@ RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/ ################################################ ## install openjpeg ################################################ - mkdir -p /tmp/openjpeg + mkdir -p /tmp/openjpeg; WORKDIR /tmp/openjpeg -RUN docker-package-download -o openjpeg.tar.gz -s https://codeload.github.com/uclouvain/openjpeg/tar.gz/v${OPENJPEG_VERSION}; \ +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)"; \ make install; \ + make clean; \ ################################################ ## install imagick ################################################ - mkdir -p /tmp/imagemagick; \ + mkdir -p /tmp/imagemagick; WORKDIR /tmp/imagemagick -RUN docker-package-download -o imagemagick.tar.gz -s https://codeload.github.com/ImageMagick/ImageMagick/tar.gz/${IMAGICK_VERSION}; \ +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 \ From 374f5cde8338a8278791db17633b061f3a74f772 Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Mon, 27 Jan 2025 12:11:41 +0100 Subject: [PATCH 3/3] [INFRA] remove cd, replace with workdir --- src/bookworm/src/Dockerfile | 7 ++++--- src/bullseye/src/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bookworm/src/Dockerfile b/src/bookworm/src/Dockerfile index 3b67857..ebadd9f 100644 --- a/src/bookworm/src/Dockerfile +++ b/src/bookworm/src/Dockerfile @@ -93,9 +93,9 @@ RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/ 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; \ + mkdir build; +WORKDIR /tmp/openjpeg/build +RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \ make -j"$(nproc)"; \ make install; \ make clean; \ @@ -121,4 +121,5 @@ RUN docker-package-download -o imagemagick.tar.gz -s https://github.com/Imagick/ ; \ make -j"$(nproc)"; \ make install; \ + make clean; \ /usr/local/bin/docker-layer-clean diff --git a/src/bullseye/src/Dockerfile b/src/bullseye/src/Dockerfile index 34b4e73..2048c57 100644 --- a/src/bullseye/src/Dockerfile +++ b/src/bullseye/src/Dockerfile @@ -93,9 +93,9 @@ RUN docker-package-download -o libwebp.tar.gz -s https://storage.googleapis.com/ 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; \ + mkdir build; +WORKDIR /tmp/openjpeg/build +RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; \ make -j"$(nproc)"; \ make install; \ make clean; \