From 126059214166fdbcdb744c5d4e3d2751b44c2ce6 Mon Sep 17 00:00:00 2001
From: Matthew Horwood <matt@horwood.biz>
Date: Tue, 24 May 2022 21:44:43 +0100
Subject: [PATCH 1/2] Alpine 3.16

feat: bump to Alpine 3.16
feat: bump to php81
---
 Dockerfile     | 14 +++++++-------
 setup/start.sh |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cc54cc..39eea1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM alpine:3.15
+FROM alpine:3.16
 MAINTAINER Matthew Horwood <matt@horwood.biz>
 
 # Install required deb packages
 RUN apk update && \
-    apk add gnupg nginx php7-fpm php7-common php7-iconv php7-json php7-gd \
-    php7-curl php7-xml php7-mysqli php7-imap php7-pdo php7-pdo_mysql \
-    php7-soap php7-xmlrpc php7-posix php7-mcrypt php7-gettext php7-ldap \
-    php7-ctype php7-dom php7-session php7-mbstring curl \
+    apk add gnupg nginx php81-fpm php81-common php81-iconv php81-json php81-gd \
+    php81-curl php81-xml php81-mysqli php81-imap php81-pdo php81-pdo_mysql \
+    php81-soap php81-posix php81-gettext php81-ldap \
+    php81-ctype php81-dom php81-session php81-mbstring curl \
     && mkdir -p /var/www/html/ \
     && mkdir -p /run/nginx \
     && rm -f /var/cache/apk/*;
@@ -44,8 +44,8 @@ RUN set -ex; \
     sed -i "s@'configFile' => ROOT_PATH . 'config.inc.php',@'configFile' => '/etc/phpmyadmin/config.inc.php',@" /usr/src/phpmyadmin/libraries/vendor_config.php; \
     cp -R /usr/src/phpmyadmin/* /var/www/html/; \
     cp /config/config.inc.php /etc/phpmyadmin/config.inc.php && \
-    cp /config/php.ini /etc/php7/php.ini && \
-    cp /config/php_fpm_site.conf /etc/php7/php-fpm.d/www.conf; \
+    cp /config/php.ini /etc/php81/php.ini && \
+    cp /config/php_fpm_site.conf /etc/php81/php-fpm.d/www.conf; \
     chown -R nobody:nginx /var/www/html /sessions; \
     cp /config/nginx_site.conf /etc/nginx/http.d/default.conf; \
     cp /config/healthcheck.php /var/www/html/;
diff --git a/setup/start.sh b/setup/start.sh
index 06f866e..660b873 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ln -s /dev/stdout /var/log/php7/error.log
+ln -s /dev/stdout /var/log/php81/error.log
 ln -s /dev/stdout /var/log/nginx/access.log
 ln -s /dev/stdout /var/log/nginx/error.log
 
@@ -15,6 +15,6 @@ if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
     touch /etc/phpmyadmin/config.user.inc.php
 fi
 
-php-fpm7
+php-fpm81
 
 exec "$@"

From b44d430346d5750fb4ba90685ccfa4a25db550c8 Mon Sep 17 00:00:00 2001
From: Matthew Horwood <matt@horwood.biz>
Date: Tue, 24 May 2022 21:49:04 +0100
Subject: [PATCH 2/2] Alpine 3.16

doc: tidy
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5ce1f2f..20c0514 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ You can use following tags on Docker hub:
 Run a MySQL database, dedicated to phpmyadmin
 
 ```bash
-$ docker run --name phpmyadmin-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -v /my_dir/phpmyadmin:/var/lib/mysql -d mysql:5.7
+docker run --name phpmyadmin-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -v /my_dir/phpmyadmin:/var/lib/mysql -d mysql:5.7
 ```
 
 Here, we store data on the host system under `/my_dir/phpmyadmin` and use a specific root password.