diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e896ccc6a77d84ae11cce50fae47e76cb752d44b..4494d7c682cb9472eba315bc4615a1f5232c8da3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ before_script: build-stable: stage: build script: - - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:20180422 --destination $CI_REGISTRY_IMAGE:20180422-2 + - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:20180422 --destination $CI_REGISTRY_IMAGE:20180422-3 only: - stable diff --git a/Dockerfile b/Dockerfile index 9beb9dbfd38e51f0a2d40489066a47aaab453c54..912b4b6315831d5bd874034a3943f7dcb1f7e423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF # Basic info ARG NAME ARG BUILD_DATE -ARG VERSION=20180422.a-2.1-2 +ARG VERSION=20180422.a-2.1-3 ARG VCS_REF ARG VCS_URL diff --git a/content/etc/apache2/sites-available/dokuwiki-ssl-redirect.conf b/content/etc/apache2/sites-available/dokuwiki-ssl-redirect.conf index 4e3dc20860cb91d92228867ff62e4ce55406f3ac..cb8d2f4bcbff580c5ff7334165a36233e0614032 100644 --- a/content/etc/apache2/sites-available/dokuwiki-ssl-redirect.conf +++ b/content/etc/apache2/sites-available/dokuwiki-ssl-redirect.conf @@ -2,6 +2,6 @@ DocumentRoot /var/www RewriteEngine On - RewriteCond %{REQUEST_URI} !\.well-known/acme-challenge + RewriteCond %{REQUEST_URI} !(\.well-known/acme-challenge|server-status) RewriteRule ^/?(.*) https://%{HTTP_HOST}/$1 [L] </VirtualHost>