diff options
author | Tilo Spannagel <development@tilosp.de> | 2018-03-08 09:52:55 +0100 |
---|---|---|
committer | Tilo Spannagel <development@tilosp.de> | 2018-03-08 12:24:16 +0100 |
commit | a82a812df022e59abb36e19d1803022aba0864c2 (patch) | |
tree | f5aead46beaa2d753860fc6e4185f850d7b8a700 | |
parent | 5c05c9eba0a97e36fca6d0e00a4da66db9544b9c (diff) |
Use var for the php version
-rw-r--r-- | Dockerfile-alpine.template | 2 | ||||
-rw-r--r-- | Dockerfile-debian.template | 2 | ||||
-rwxr-xr-x | update.sh | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index b1a0f96b..42b6318a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM php:7.1-%%VARIANT%% +FROM php:%%PHP_VERSION%%-%%VARIANT%% # entrypoint.sh and cron.sh dependencies RUN set -ex; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a5db872a..e55ce5e9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM php:7.1-%%VARIANT%% +FROM php:%%PHP_VERSION%%-%%VARIANT%% # entrypoint.sh and cron.sh dependencies RUN set -ex; \ @@ -1,6 +1,10 @@ #!/bin/bash set -eo pipefail +declare -A php_version=( + [default]='7.1' +) + declare -A cmd=( [apache]='apache2-foreground' [fpm]='php-fpm' @@ -59,6 +63,7 @@ for latest in "${latests[@]}"; do # Replace the variables. sed -ri -e ' + s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g; s/%%VARIANT%%/'"$variant"'/g; s/%%VERSION%%/'"$latest"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g; |