diff --git a/Dockerfile b/Dockerfile index f53685d..e9e24a7 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 184582c..8cbd564 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 65cc114..25a3690 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 79c9972..d994f98 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 43883a9..1d3c0f8 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -17,7 +17,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 77785af..808bedb 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,6 +40,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "18.12.19:", desc: "Add php7-imap and php7-pecl-apcu." } - { date: "13.11.19:", desc: "Add php7-pdo_odbc." } - { date: "24.10.19:", desc: "Add php7-pecl-imagick." }