From 3cd71ca54e14c7fc4818a8262b2c1aaa875c7a71 Mon Sep 17 00:00:00 2001 From: Mateusz Marzantowicz Date: Tue, 27 Nov 2018 15:04:54 +0100 Subject: [PATCH] Match image version with corresponding Server Administration Manual Signed-off-by: Mateusz Marzantowicz --- Dockerfile-alpine.template | 4 ++-- Dockerfile-debian.template | 4 ++-- update.sh | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6683f2b1..1b336054 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,7 +11,7 @@ RUN set -ex; \ echo '*/15 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data # install the PHP extensions we need -# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html +# see https://docs.nextcloud.com/server/%%DOCS_VERSION%%/admin_manual/installation/source_installation.html RUN set -ex; \ \ apk add --no-cache --virtual .build-deps \ @@ -64,7 +64,7 @@ RUN set -ex; \ apk del .build-deps # set recommended PHP.ini settings -# see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache +# see https://docs.nextcloud.com/server/%%DOCS_VERSION%%/admin_manual/configuration_server/server_tuning.html#enable-php-opcache RUN { \ echo 'opcache.enable=1'; \ echo 'opcache.enable_cli=1'; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 7f451512..54cb8ccb 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -15,7 +15,7 @@ RUN set -ex; \ echo '*/15 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data # install the PHP extensions we need -# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html +# see https://docs.nextcloud.com/server/%%DOCS_VERSION%%/admin_manual/installation/source_installation.html RUN set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ @@ -75,7 +75,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # set recommended PHP.ini settings -# see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache +# see https://docs.nextcloud.com/server/%%DOCS_VERSION%%/admin_manual/configuration_server/server_tuning.html#enable-php-opcache RUN { \ echo 'opcache.enable=1'; \ echo 'opcache.enable_cli=1'; \ diff --git a/update.sh b/update.sh index 842dc659..2f258d4b 100755 --- a/update.sh +++ b/update.sh @@ -78,6 +78,7 @@ function create_variant() { s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g; s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g; s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g; + s/%%DOCS_VERSION%%/'"${1%.*}"'/g; ' "$dir/Dockerfile" # Copy the shell scripts