From 5cf034d07c10cda171168ce0821f5bffc9d0ec1f Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 12 Feb 2022 10:11:27 +0100
Subject: [PATCH] Fix bullseye mysql build

---
 build.sh                       | 2 +-
 bullseye_php7/Dockerfile-base  | 4 ++++
 bullseye_php7/Dockerfile-mysql | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 46c1df1..0a2e663 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 
 for dist in jessie_php5 stretch_php7 buster_php7 bullseye_php7; do
     docker build --pull -t gnuviech/${dist}-base ${dist} -f ${dist}/Dockerfile-base
-    docker build --no-cache -t gnuviech/${dist} ${dist} -f ${dist}/Dockerfile
+    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
 done
diff --git a/bullseye_php7/Dockerfile-base b/bullseye_php7/Dockerfile-base
index 1c69911..a37ee8d 100644
--- a/bullseye_php7/Dockerfile-base
+++ b/bullseye_php7/Dockerfile-base
@@ -5,9 +5,11 @@ VOLUME /srv
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
+    ca-certificates \
     dumb-init \
     libnss-ldap \
     nullmailer \
+    openssl \
     php-mail-mime \
     php-net-smtp \
     php-net-socket \
@@ -19,11 +21,13 @@ RUN apt-get update \
     php7.4-gd \
     php7.4-imagick \
     php7.4-imap \
+    php7.4-intl \
     php7.4-json \
     php7.4-mbstring \
     php7.4-opcache \
     php7.4-pspell \
     php7.4-sqlite3 \
+    php7.4-zip \
     psmisc \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*.*
diff --git a/bullseye_php7/Dockerfile-mysql b/bullseye_php7/Dockerfile-mysql
index fb75ee8..dc3aaff 100644
--- a/bullseye_php7/Dockerfile-mysql
+++ b/bullseye_php7/Dockerfile-mysql
@@ -4,6 +4,7 @@ LABEL maintainer="jan@dittberner.info"
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
+    php7.4-dba \
     php7.4-mysql \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*.*