From b56b02ab1eb918da0d2287aeab28488e36db32b1 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Tue, 19 Sep 2023 13:52:01 +0200
Subject: [PATCH] Switch to PHP 8.2 in Bookworm
---
bookworm_php8/Dockerfile | 2 +-
bookworm_php8/Dockerfile-base | 26 +++++++++++++-------------
bookworm_php8/Dockerfile-mysql | 6 +++---
bookworm_php8/Dockerfile-pgsql | 4 ++--
bookworm_php8/start-fpm.sh | 4 ++--
build.sh | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bookworm_php8/Dockerfile b/bookworm_php8/Dockerfile
index 68f6d44..8738460 100644
--- a/bookworm_php8/Dockerfile
+++ b/bookworm_php8/Dockerfile
@@ -1,7 +1,7 @@
FROM gnuviech/bookworm_php8-base:latest
LABEL maintainer="jan@dittberner.info"
-RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf
+RUN rm -f /etc/php/8.2/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bookworm_php8/Dockerfile-base b/bookworm_php8/Dockerfile-base
index 14356d2..3ca189a 100644
--- a/bookworm_php8/Dockerfile-base
+++ b/bookworm_php8/Dockerfile-base
@@ -13,19 +13,19 @@ RUN apt-get update \
php-mail-mime \
php-net-smtp \
php-net-socket \
- php8.1 \
- php8.1-curl \
- php8.1-fpm \
- php8.1-fpm \
- php8.1-gd \
- php8.1-imagick \
- php8.1-imap \
- php8.1-intl \
- php8.1-mbstring \
- php8.1-opcache \
- php8.1-pspell \
- php8.1-sqlite3 \
- php8.1-zip \
+ php8.2 \
+ php8.2-curl \
+ php8.2-fpm \
+ php8.2-fpm \
+ php8.2-gd \
+ php8.2-imagick \
+ php8.2-imap \
+ php8.2-intl \
+ php8.2-mbstring \
+ php8.2-opcache \
+ php8.2-pspell \
+ php8.2-sqlite3 \
+ php8.2-zip \
psmisc \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*.*
diff --git a/bookworm_php8/Dockerfile-mysql b/bookworm_php8/Dockerfile-mysql
index fb23036..04c93f4 100644
--- a/bookworm_php8/Dockerfile-mysql
+++ b/bookworm_php8/Dockerfile-mysql
@@ -4,12 +4,12 @@ LABEL maintainer="jan@dittberner.info"
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
- php8.1-dba \
- php8.1-mysql \
+ php8.2-dba \
+ php8.2-mysql \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*.*
-RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf
+RUN rm -f /etc/php/8.2/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bookworm_php8/Dockerfile-pgsql b/bookworm_php8/Dockerfile-pgsql
index a146175..6a6697d 100644
--- a/bookworm_php8/Dockerfile-pgsql
+++ b/bookworm_php8/Dockerfile-pgsql
@@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
- php8.1-pgsql \
+ php8.2-pgsql \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*.*
-RUN rm -f /etc/php/8.1/fpm/pool.d/www.conf
+RUN rm -f /etc/php/8.2/fpm/pool.d/www.conf
COPY start-fpm.sh /usr/local/sbin
COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bookworm_php8/start-fpm.sh b/bookworm_php8/start-fpm.sh
index 04b38bb..0536dca 100755
--- a/bookworm_php8/start-fpm.sh
+++ b/bookworm_php8/start-fpm.sh
@@ -4,8 +4,8 @@ set -e
sed "s/@user@/${FPM_USER}/g; s/@variant@/${FPM_VARIANT}/g" \
< /usr/local/etc/fpm-pool.conf.tmpl \
- > "/etc/php/8.1/fpm/pool.d/${FPM_USER}.conf"
+ > "/etc/php/8.2/fpm/pool.d/${FPM_USER}.conf"
/etc/init.d/nullmailer start
mkdir -p /run/php
-/usr/sbin/php-fpm8.1 --nodaemonize
+/usr/sbin/php-fpm8.2 --nodaemonize
diff --git a/build.sh b/build.sh
index c0d4d12..dbfc8a1 100755
--- a/build.sh
+++ b/build.sh
@@ -2,8 +2,8 @@
set -e
-for dist in jessie_php5 stretch_php7 buster_php7 bullseye_php7 bookworm_php8; do
- docker build --pull -t gnuviech/${dist}-base ${dist} -f ${dist}/Dockerfile-base
+for dist in buster_php7 bullseye_php7 bookworm_php8; do
+ docker build --pull --no-cache -t gnuviech/${dist}-base ${dist} -f ${dist}/Dockerfile-base
docker build -t gnuviech/${dist} ${dist} -f ${dist}/Dockerfile
docker build -t gnuviech/${dist}-mysql ${dist} -f ${dist}/Dockerfile-mysql
docker build -t gnuviech/${dist}-pgsql ${dist} -f ${dist}/Dockerfile-pgsql