From 4a5875f495eaa6747f8f597a90f9e94450ca3ed8 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 1 Jun 2023 16:26:05 +0200 Subject: [PATCH] update.sh: Add 'php_version' variable Signed-off-by: Daniel Rudolf --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- update.sh | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a85796d..b6fbe3b 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM php:8.1-%%VARIANT%% +FROM php:%%PHP_VERSION%%-%%VARIANT%% # docker-entrypoint.sh dependencies RUN apk add --no-cache \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 073911c..f8edf50 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM php:8.1-%%VARIANT%% +FROM php:%%PHP_VERSION%%-%%VARIANT%% # Install dependencies RUN set -ex; \ diff --git a/update.sh b/update.sh index dad12f7..b4d062c 100755 --- a/update.sh +++ b/update.sh @@ -7,6 +7,10 @@ command -v jq >/dev/null 2>&1 || { echo >&2 "'jq' is required but not found. Abo [ -n "${BASH_VERSINFO}" ] && [ -n "${BASH_VERSINFO[0]}" ] && [ ${BASH_VERSINFO[0]} -ge 4 ] \ || { echo >&2 "Bash 4.0 or greater is required. Aborting."; exit 1; } +declare -A php_version=( + [default]='8.1' +) + declare -A cmd=( [apache]='apache2-foreground' [fpm]='php-fpm' @@ -33,6 +37,7 @@ function create_variant() { local branch="$(sed -ne 's/^\([0-9]*\.[0-9]*\)\..*$/\1/p' <<< "$version")" local url="$(download_url "$version")" local ascUrl="$(download_url "$version").asc" + local phpVersion="${php_version[$version]-${php_version[default]}}" echo "updating $version [$branch] $variant" @@ -45,6 +50,7 @@ function create_variant() { s/%%SHA256%%/'"$sha256"'/; s/%%DOWNLOAD_URL%%/'"$(sed -e 's/[\/&]/\\&/g' <<< "$url")"'/; s/%%DOWNLOAD_URL_ASC%%/'"$(sed -e 's/[\/&]/\\&/g' <<< "$ascUrl")"'/; + s/%%PHP_VERSION%%/'"$phpVersion"'/g; s/%%GPG_KEY%%/'"$gpg_key"'/g; s/%%VARIANT%%/'"$variant"'/; s/%%CMD%%/'"${cmd[$variant]}"'/;