[INFRA] fix commands, bump versions

Author: mautz-et-tong

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 \

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 \