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

Use var for pecl package versions

Browse Source
This commit is contained in:
Tilo Spannagel 2018-03-08 09:38:24 +01:00
parent f0e9f272b0
commit 7e390bc4b5
No known key found for this signature in database
GPG Key ID: B89F1626A58E1429
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile-alpine.template
View File

@ -49,9 +49,9 @@ RUN set -ex; \
zip \ zip \
; \ ; \
pecl install \ pecl install \
APCu-5.1.10 \ APCu-%%APCU_VERSION%% \
memcached-3.0.4 \ memcached-%%MEMCACHED_VERSION%% \
redis-3.1.6 \ redis-%%REDIS_VERSION%% \
; \ ; \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \

6
Dockerfile-debian.template
View File

@ -53,9 +53,9 @@ RUN set -ex; \
zip \ zip \
; \ ; \
pecl install \ pecl install \
APCu-5.1.10 \ APCu-%%APCU_VERSION%% \
memcached-3.0.4 \ memcached-%%MEMCACHED_VERSION%% \
redis-3.1.6 \ redis-%%REDIS_VERSION%% \
; \ ; \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \

9
update.sh
View File

@ -19,6 +19,12 @@ declare -A extras=(
[fpm-alpine]='' [fpm-alpine]=''
) )
declare -A pecl_versions=(
[APCu]='5.1.10'
[memcached]='3.0.4'
[redis]='3.1.6'
)
# version_greater_or_equal A B returns whether A >= B # version_greater_or_equal A B returns whether A >= B
function version_greater_or_equal() { function version_greater_or_equal() {
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]]; [[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]];
@ -57,6 +63,9 @@ for latest in "${latests[@]}"; do
s/%%VERSION%%/'"$latest"'/g; s/%%VERSION%%/'"$latest"'/g;
s/%%CMD%%/'"${cmd[$variant]}"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g;
s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g; s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g;
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
' "$version/$variant/Dockerfile" ' "$version/$variant/Dockerfile"
# Copy the shell scripts # Copy the shell scripts