From b0856007aae68b064f81830481ea549f44d1cc4c Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Mon, 29 May 2023 13:05:34 +0200 Subject: [PATCH] Add %%DEBIAN_VERSION%% placeholder Signed-off-by: Daniel Rudolf --- Dockerfile-debian.template | 2 +- update.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index d3fb81ee..38cb93f3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM php:%%PHP_VERSION%%-%%VARIANT%%-bullseye +FROM php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%% # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index d19cad71..2f724815 100755 --- a/update.sh +++ b/update.sh @@ -8,6 +8,10 @@ declare -A alpine_version=( [default]='3.17' ) +declare -A debian_version=( + [default]='bullseye' +) + declare -A php_version=( [default]='8.1' ) @@ -93,6 +97,7 @@ function version_greater_or_equal() { function create_variant() { dir="$1/$variant" alpineVersion=${alpine_version[$version]-${alpine_version[default]}} + debianVersion=${debian_version[$version]-${debian_version[default]}} phpVersion=${php_version[$version]-${php_version[default]}} crontabInt=${crontab_int[$version]-${crontab_int[default]}} @@ -108,6 +113,7 @@ function create_variant() { # Replace the variables. sed -ri -e ' s/%%ALPINE_VERSION%%/'"$alpineVersion"'/g; + s/%%DEBIAN_VERSION%%/'"$debianVersion"'/g; s/%%PHP_VERSION%%/'"$phpVersion"'/g; s/%%VARIANT%%/'"$variant"'/g; s/%%VERSION%%/'"$fullversion"'/g;