From 22d28e45cdcdb553239af45c7b1566d628f72bc6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 31 May 2023 15:17:36 +0000 Subject: [PATCH] Alpine 3.18 & PHP 8.2 (#1989) Signed-off-by: J0WI --- 26/apache/Dockerfile | 2 +- 26/fpm-alpine/Dockerfile | 2 +- 26/fpm/Dockerfile | 2 +- update.sh | 5 +++-- versions.json | 8 ++++---- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile index 9efd8fd6..f68f2834 100644 --- a/26/apache/Dockerfile +++ b/26/apache/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.1-apache-bullseye +FROM php:8.2-apache-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/26/fpm-alpine/Dockerfile b/26/fpm-alpine/Dockerfile index 14a0e90b..0ea82474 100644 --- a/26/fpm-alpine/Dockerfile +++ b/26/fpm-alpine/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template -FROM php:8.1-fpm-alpine3.17 +FROM php:8.2-fpm-alpine3.18 # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/26/fpm/Dockerfile b/26/fpm/Dockerfile index 303f0efb..ff51826e 100644 --- a/26/fpm/Dockerfile +++ b/26/fpm/Dockerfile @@ -1,5 +1,5 @@ # DO NOT EDIT: created by update.sh from Dockerfile-debian.template -FROM php:8.1-fpm-bullseye +FROM php:8.2-fpm-bullseye # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index 3b0c7dd4..8282d826 100755 --- a/update.sh +++ b/update.sh @@ -2,8 +2,8 @@ set -eo pipefail declare -A alpine_version=( - [default]='3.17' [25]='3.16' + [default]='3.18' ) declare -A debian_version=( @@ -11,7 +11,8 @@ declare -A debian_version=( ) declare -A php_version=( - [default]='8.1' + [25]='8.1' + [default]='8.2' ) declare -A cmd=( diff --git a/versions.json b/versions.json index 26c537af..737135bc 100644 --- a/versions.json +++ b/versions.json @@ -9,19 +9,19 @@ "variant": "apache", "base": "debian", "baseVersion": "bullseye", - "phpVersion": "8.1" + "phpVersion": "8.2" }, "fpm": { "variant": "fpm", "base": "debian", "baseVersion": "bullseye", - "phpVersion": "8.1" + "phpVersion": "8.2" }, "fpm-alpine": { "variant": "fpm-alpine", "base": "alpine", - "baseVersion": "3.17", - "phpVersion": "8.1" + "baseVersion": "3.18", + "phpVersion": "8.2" } } },