From 165698da7b5d0033db7502d2275a8626e5802da0 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 21 Mar 2023 22:44:22 +0000 Subject: [PATCH] Alpine 3.17 (#1953) Signed-off-by: J0WI --- Dockerfile-alpine.template | 2 +- update.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 43b85308..59b73bcc 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM php:%%PHP_VERSION%%-%%VARIANT%%3.16 +FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%% # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index a8089ff3..608f263e 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash set -eo pipefail +declare -A alpine_version=( + [24]='3.16' + [25]='3.16' + [default]='3.17' +) + declare -A php_version=( [24]='8.0' [default]='8.1' @@ -86,6 +92,7 @@ function version_greater_or_equal() { function create_variant() { dir="$1/$variant" + alpineVersion=${alpine_version[$version]-${alpine_version[default]}} phpVersion=${php_version[$version]-${php_version[default]}} crontabInt=${crontab_int[$version]-${crontab_int[default]}} @@ -100,6 +107,7 @@ function create_variant() { # Replace the variables. sed -ri -e ' + s/%%ALPINE_VERSION%%/'"$alpineVersion"'/g; s/%%PHP_VERSION%%/'"$phpVersion"'/g; s/%%VARIANT%%/'"$variant"'/g; s/%%VERSION%%/'"$fullversion"'/g;