From d3fac136760f48882f091785b0c4965a1e099ef9 Mon Sep 17 00:00:00 2001 From: Marvin Date: Fri, 26 Jul 2024 08:38:18 +0200 Subject: [PATCH 1/4] Update debian version --- php/Dockerfile.php-74 | 4 ++-- php/Dockerfile.php-80 | 4 ++-- php/Dockerfile.php-81 | 4 ++-- php/Dockerfile.php-82 | 4 ++-- php/Dockerfile.php-83 | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/php/Dockerfile.php-74 b/php/Dockerfile.php-74 index 43613fc..4c8110b 100644 --- a/php/Dockerfile.php-74 +++ b/php/Dockerfile.php-74 @@ -2,7 +2,7 @@ # includes apache, php, xhprof, imagemagick, sshd and drush # No mysql, use a dedicated mysql-docker-image and link the container. -FROM debian:buster +FROM debian:bookworm LABEL org.opencontainers.image.authors="stephan@factorial.io" RUN dpkg-divert --local --rename --add /sbin/initctl @@ -14,7 +14,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update --fix-missing && apt RUN /usr/bin/wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list -RUN export DEBIAN_FRONTEND=noninteractive && apt-get update --fix-missing && apt-get -y -q install rsync unzip apache2 pwgen python-setuptools vim-tiny openssh-server cron vim curl graphviz make imagemagick libapache2-mod-php7.4 php7.4-mysql php7.4-curl php7.4-memcache php7.4-redis php7.4-mbstring php7.4-zip php7.4-gd php7.4-dom php7.4-xml php7.4-bcmath php7.4-soap php7.4-sqlite3 +RUN export DEBIAN_FRONTEND=noninteractive && apt-get update --fix-missing && apt-get -y -q install rsync unzip apache2 pwgen python3-setuptools vim-tiny openssh-server cron vim curl graphviz make imagemagick libapache2-mod-php7.4 php7.4-mysql php7.4-curl php7.4-memcache php7.4-redis php7.4-mbstring php7.4-zip php7.4-gd php7.4-dom php7.4-xml php7.4-bcmath php7.4-soap php7.4-sqlite3 # composer and drush RUN curl -ss https://getcomposer.org/installer | php diff --git a/php/Dockerfile.php-80 b/php/Dockerfile.php-80 index be9af59..571e65e 100644 --- a/php/Dockerfile.php-80 +++ b/php/Dockerfile.php-80 @@ -4,7 +4,7 @@ # # VERSION php-80 # DOCKER-VERSION 2 -FROM debian:buster +FROM debian:bookworm LABEL org.opencontainers.image.authors="stephan@factorial.io" RUN dpkg-divert --local --rename --add /sbin/initctl @@ -38,7 +38,7 @@ RUN echo 'root:root' |chpasswd RUN sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf RUN a2enmod rewrite vhost_alias -RUN pip3 install supervisor +RUN pip3 install supervisor --break-system-packages ADD ./common/start.sh /start.sh ADD ./common/foreground.sh /etc/apache2/foreground.sh ADD ./common/apache-vhost.conf /etc/apache2/sites-available/000-default.conf diff --git a/php/Dockerfile.php-81 b/php/Dockerfile.php-81 index 21374a8..5a07036 100644 --- a/php/Dockerfile.php-81 +++ b/php/Dockerfile.php-81 @@ -4,7 +4,7 @@ # # VERSION php-81 # DOCKER-VERSION 2 -FROM debian:buster +FROM debian:bookworm LABEL org.opencontainers.image.authors="stephan@factorial.io" RUN dpkg-divert --local --rename --add /sbin/initctl @@ -38,7 +38,7 @@ RUN echo 'root:root' |chpasswd RUN sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf RUN a2enmod rewrite vhost_alias -RUN pip3 install supervisor +RUN pip3 install supervisor --break-system-packages ADD ./common/start.sh /start.sh ADD ./common/foreground.sh /etc/apache2/foreground.sh ADD ./common/apache-vhost.conf /etc/apache2/sites-available/000-default.conf diff --git a/php/Dockerfile.php-82 b/php/Dockerfile.php-82 index 9cf12a5..1c72686 100644 --- a/php/Dockerfile.php-82 +++ b/php/Dockerfile.php-82 @@ -4,7 +4,7 @@ # # VERSION php-81 # DOCKER-VERSION 2 -FROM debian:buster +FROM debian:bookworm LABEL org.opencontainers.image.authors="stephan@factorial.io" RUN dpkg-divert --local --rename --add /sbin/initctl @@ -38,7 +38,7 @@ RUN echo 'root:root' |chpasswd RUN sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf RUN a2enmod rewrite vhost_alias -RUN pip3 install supervisor +RUN pip3 install supervisor --break-system-packages ADD ./common/start.sh /start.sh ADD ./common/foreground.sh /etc/apache2/foreground.sh ADD ./common/apache-vhost.conf /etc/apache2/sites-available/000-default.conf diff --git a/php/Dockerfile.php-83 b/php/Dockerfile.php-83 index 77b4331..270b411 100644 --- a/php/Dockerfile.php-83 +++ b/php/Dockerfile.php-83 @@ -4,7 +4,7 @@ # # VERSION php-83 # DOCKER-VERSION 2 -FROM debian:buster +FROM debian:bookworm LABEL org.opencontainers.image.authors="stephan@factorial.io" RUN dpkg-divert --local --rename --add /sbin/initctl @@ -38,7 +38,7 @@ RUN echo 'root:root' |chpasswd RUN sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf RUN a2enmod rewrite vhost_alias -RUN pip3 install supervisor +RUN pip3 install supervisor --break-system-packages ADD ./common/start.sh /start.sh ADD ./common/foreground.sh /etc/apache2/foreground.sh ADD ./common/apache-vhost.conf /etc/apache2/sites-available/000-default.conf From 56a1a250438cf51bea27399ea2b11ac033c59379 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Fri, 26 Jul 2024 09:56:29 +0200 Subject: [PATCH 2/4] fix build-script --- build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 0923815..853f105 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ export WHAT=$1 if [ -z $2 ] then - export VERSIONS_TO_BUILD="74 80 81 82 83" + export VERSIONS_TO_BUILD="81 82 83" else export VERSIONS_TO_BUILD="$2" fi @@ -101,6 +101,7 @@ function build_version() { local suffix=$2 echo "Building $php_version and tagging it with suffix $suffix" + echo $PWD cd php build_and_push_image $php_version php-$1 php-$1$suffix cd ../php-xdebug @@ -108,8 +109,8 @@ function build_version() { cd ../php-wkhtmltopdf build_and_push_image $php_version php-$1$suffix php-$php_version-wkhtmltopdf$suffix cd ../php-node - build_node_and_push_image $php_version php-$1$suffix $suffix + cd .. } From f2dc4234509601c5b7585d955d20e67080ddc805 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Fri, 26 Jul 2024 09:56:46 +0200 Subject: [PATCH 3/4] fix wkhtmltopdf builds --- php-wkhtmltopdf/Dockerfile.php-74 | 5 ++--- php-wkhtmltopdf/Dockerfile.php-80 | 4 ++-- php-wkhtmltopdf/Dockerfile.php-81 | 4 ++-- php-wkhtmltopdf/Dockerfile.php-82 | 4 ++-- php-wkhtmltopdf/Dockerfile.php-83 | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/php-wkhtmltopdf/Dockerfile.php-74 b/php-wkhtmltopdf/Dockerfile.php-74 index 45d9741..7e2ad7c 100644 --- a/php-wkhtmltopdf/Dockerfile.php-74 +++ b/php-wkhtmltopdf/Dockerfile.php-74 @@ -10,6 +10,5 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ arm64) ARCH='arm64';; \ *) ARCH='amd64' ;; \ esac \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_$ARCH.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_$ARCH.deb - + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb \ + && dpkg -i wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb diff --git a/php-wkhtmltopdf/Dockerfile.php-80 b/php-wkhtmltopdf/Dockerfile.php-80 index 8277a7a..7e2ad7c 100644 --- a/php-wkhtmltopdf/Dockerfile.php-80 +++ b/php-wkhtmltopdf/Dockerfile.php-80 @@ -10,5 +10,5 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ arm64) ARCH='arm64';; \ *) ARCH='amd64' ;; \ esac \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_$ARCH.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_$ARCH.deb + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb \ + && dpkg -i wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb diff --git a/php-wkhtmltopdf/Dockerfile.php-81 b/php-wkhtmltopdf/Dockerfile.php-81 index 8277a7a..7e2ad7c 100644 --- a/php-wkhtmltopdf/Dockerfile.php-81 +++ b/php-wkhtmltopdf/Dockerfile.php-81 @@ -10,5 +10,5 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ arm64) ARCH='arm64';; \ *) ARCH='amd64' ;; \ esac \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_$ARCH.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_$ARCH.deb + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb \ + && dpkg -i wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb diff --git a/php-wkhtmltopdf/Dockerfile.php-82 b/php-wkhtmltopdf/Dockerfile.php-82 index 8277a7a..7e2ad7c 100644 --- a/php-wkhtmltopdf/Dockerfile.php-82 +++ b/php-wkhtmltopdf/Dockerfile.php-82 @@ -10,5 +10,5 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ arm64) ARCH='arm64';; \ *) ARCH='amd64' ;; \ esac \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_$ARCH.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_$ARCH.deb + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb \ + && dpkg -i wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb diff --git a/php-wkhtmltopdf/Dockerfile.php-83 b/php-wkhtmltopdf/Dockerfile.php-83 index 8277a7a..7e2ad7c 100644 --- a/php-wkhtmltopdf/Dockerfile.php-83 +++ b/php-wkhtmltopdf/Dockerfile.php-83 @@ -10,5 +10,5 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ arm64) ARCH='arm64';; \ *) ARCH='amd64' ;; \ esac \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_$ARCH.deb \ - && dpkg -i wkhtmltox_0.12.6-1.buster_$ARCH.deb + && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb \ + && dpkg -i wkhtmltox_0.12.6.1-3.bookworm_$ARCH.deb From 40821196fba9af4530928c3583378d9917421d47 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Fri, 26 Jul 2024 09:57:48 +0200 Subject: [PATCH 4/4] Remove debug --- build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sh b/build.sh index 853f105..b663379 100755 --- a/build.sh +++ b/build.sh @@ -101,7 +101,6 @@ function build_version() { local suffix=$2 echo "Building $php_version and tagging it with suffix $suffix" - echo $PWD cd php build_and_push_image $php_version php-$1 php-$1$suffix cd ../php-xdebug