adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #279 from nextcloud/var-php-version

Browse Source 
Use var for the php version
This commit is contained in:
Tilo Spannagel 2018-03-12 15:42:07 +01:00 committed by GitHub
commit cf450e5d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-alpine.template
View File

@ -1,4 +1,4 @@
FROM php:7.1-%%VARIANT%% FROM php:%%PHP_VERSION%%-%%VARIANT%%
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \

2
Dockerfile-debian.template
View File

@ -1,4 +1,4 @@
FROM php:7.1-%%VARIANT%% FROM php:%%PHP_VERSION%%-%%VARIANT%%
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \

5
update.sh
View File

@ -1,6 +1,10 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
declare -A php_version=(
[default]='7.1'
)
declare -A cmd=( declare -A cmd=(
[apache]='apache2-foreground' [apache]='apache2-foreground'
[fpm]='php-fpm' [fpm]='php-fpm'
@ -59,6 +63,7 @@ for latest in "${latests[@]}"; do
# Replace the variables. # Replace the variables.
sed -ri -e ' sed -ri -e '
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
s/%%VARIANT%%/'"$variant"'/g; s/%%VARIANT%%/'"$variant"'/g;
s/%%VERSION%%/'"$latest"'/g; s/%%VERSION%%/'"$latest"'/g;
s/%%CMD%%/'"${cmd[$variant]}"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g;