From 39ba0e660ada8e9dd842ebac216ea4a6fcfaec78 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 31 Oct 2020 18:06:14 +0100
Subject: [PATCH] Use PHP 7.4 for bullseye

---
 bullseye_php7/Dockerfile       |  2 +-
 bullseye_php7/Dockerfile-base  | 24 +++++++++++++-----------
 bullseye_php7/Dockerfile-mysql |  4 ++--
 bullseye_php7/Dockerfile-pgsql |  4 ++--
 bullseye_php7/start-fpm.sh     |  4 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/bullseye_php7/Dockerfile b/bullseye_php7/Dockerfile
index 3b7e2ea..cb3d911 100644
--- a/bullseye_php7/Dockerfile
+++ b/bullseye_php7/Dockerfile
@@ -1,7 +1,7 @@
 FROM gnuviech/bullseye_php7-base:latest
 LABEL maintainer="jan@dittberner.info"
 
-RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf
+RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
 
 COPY start-fpm.sh /usr/local/sbin
 COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bullseye_php7/Dockerfile-base b/bullseye_php7/Dockerfile-base
index 4480005..1c69911 100644
--- a/bullseye_php7/Dockerfile-base
+++ b/bullseye_php7/Dockerfile-base
@@ -8,20 +8,22 @@ RUN apt-get update \
     dumb-init \
     libnss-ldap \
     nullmailer \
-    php-curl \
-    php-fpm \
-    php-gd \
-    php-imagick \
-    php-imap \
-    php-json \
-    php-mail \
     php-mail-mime \
-    php-mbstring \
     php-net-smtp \
     php-net-socket \
-    php-opcache \
-    php-pspell \
-    php-sqlite3 \
+    php-mail \
+    php7.4 \
+    php7.4-curl \
+    php7.4-fpm \
+    php7.4-fpm \
+    php7.4-gd \
+    php7.4-imagick \
+    php7.4-imap \
+    php7.4-json \
+    php7.4-mbstring \
+    php7.4-opcache \
+    php7.4-pspell \
+    php7.4-sqlite3 \
     psmisc \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*.*
diff --git a/bullseye_php7/Dockerfile-mysql b/bullseye_php7/Dockerfile-mysql
index b2980ba..fb75ee8 100644
--- a/bullseye_php7/Dockerfile-mysql
+++ b/bullseye_php7/Dockerfile-mysql
@@ -4,11 +4,11 @@ LABEL maintainer="jan@dittberner.info"
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
-    php-mysql \
+    php7.4-mysql \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*.*
 
-RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf
+RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
 
 COPY start-fpm.sh /usr/local/sbin
 COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bullseye_php7/Dockerfile-pgsql b/bullseye_php7/Dockerfile-pgsql
index b2980ba..0c00cfb 100644
--- a/bullseye_php7/Dockerfile-pgsql
+++ b/bullseye_php7/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 \
-    php-mysql \
+    php7.4-pgsql \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*.*
 
-RUN rm -f /etc/php/7.3/fpm/pool.d/www.conf
+RUN rm -f /etc/php/7.4/fpm/pool.d/www.conf
 
 COPY start-fpm.sh /usr/local/sbin
 COPY fpm-pool.conf.tmpl /usr/local/etc
diff --git a/bullseye_php7/start-fpm.sh b/bullseye_php7/start-fpm.sh
index f2c2580..c89dfae 100755
--- a/bullseye_php7/start-fpm.sh
+++ b/bullseye_php7/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/7.3/fpm/pool.d/${FPM_USER}.conf"
+    > "/etc/php/7.4/fpm/pool.d/${FPM_USER}.conf"
 
 /etc/init.d/nullmailer start
 mkdir -p /run/php
-/usr/sbin/php-fpm7.3 --nodaemonize
+/usr/sbin/php-fpm7.4 --nodaemonize