diff --git a/Dockerfile b/Dockerfile index 1e69eca..3101a5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.10 +FROM lsiobase/nginx:3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bc2e853..63fc37b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.10 +FROM lsiobase/nginx:arm64v8-3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e32b54b..9d6a92b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.10 +FROM lsiobase/nginx:arm32v7-3.11 # set version label ARG BUILD_DATE diff --git a/Jenkinsfile b/Jenkinsfile index 1fba540..731c690 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { DIST_IMAGE = 'alpine' MULTIARCH='true' CI='true' - CI_WEB='true' + CI_WEB='false' CI_PORT='80' CI_SSL='false' CI_DELAY='120' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e46be94..e353e82 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -18,7 +18,7 @@ repo_vars: - DIST_IMAGE = 'alpine' - MULTIARCH='true' - CI='true' - - CI_WEB='true' + - CI_WEB='false' - CI_PORT='80' - CI_SSL='false' - CI_DELAY='120' diff --git a/readme-vars.yml b/readme-vars.yml index c3e1f29..e458cfe 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,5 +40,6 @@ app_setup_block: | Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }}) # changelog changelogs: + - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "01.12.19:", desc: "Add php7-ldap package to support LDAP authentication." } - { date: "28.05.19:", desc: "Initial Release." }