From 9a4c8291306e7a8210df5a9ab5d3752c3eef5913 Mon Sep 17 00:00:00 2001
From: Christian <merzdorf.christian@web.de>
Date: Sun, 4 Dec 2022 09:52:19 +0100
Subject: [PATCH] Update base image Version and PHP Version (#15)

-Alpine Version 3.17
- PHP Version 8.1
---
 Dockerfile | 27 ++++++++++++++-------------
 bin/run.sh |  4 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e35a085..d1d1eca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,28 @@
-FROM alpine:3.15
+FROM alpine:3.17
 
 LABEL description="PostfixAdmin is a web based interface used to manage mailboxes"
 
 ARG VERSION=3.3.11
+ARG PHP_VERSION=81
 ARG SHA256_HASH="bcbee633e845f730bef7b01912da12574b6766f4f7560edc28891ff644596c22"
 
 RUN set -eux; \
+    apk update && apk upgrade; \
     apk add --no-cache \
         su-exec \
         dovecot \
         tini \
-        \
-        php8 \
-        php8-fpm \
-        php8-imap \
-        php8-mbstring \
-        php8-mysqli \
-        php8-pdo \
-        php8-pdo_mysql \
-        php8-pdo_pgsql \
-        php8-pgsql \
-        php8-phar \
-        php8-session \
+        php${PHP_VERSION} \
+        php${PHP_VERSION}-fpm \
+        php${PHP_VERSION}-imap \
+        php${PHP_VERSION}-mbstring \
+        php${PHP_VERSION}-mysqli \
+        php${PHP_VERSION}-pdo \
+        php${PHP_VERSION}-pdo_mysql \
+        php${PHP_VERSION}-pdo_pgsql \
+        php${PHP_VERSION}-pgsql \
+        php${PHP_VERSION}-phar \
+        php${PHP_VERSION}-session \
     ; \
     \
     PFA_TARBALL="postfixadmin-${VERSION}.tar.gz"; \
diff --git a/bin/run.sh b/bin/run.sh
index 55638aa..4c1664c 100644
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -91,6 +91,6 @@ cat > /postfixadmin/config.local.php <<EOF
 EOF
 
 # Upgrade
-php8 /postfixadmin/public/upgrade.php
+php /postfixadmin/public/upgrade.php
 # RUN !
-exec su-exec $UID:$GID php8 -S 0.0.0.0:8888 -t /postfixadmin/public
+exec su-exec $UID:$GID php -S 0.0.0.0:8888 -t /postfixadmin/public