New version with minor fixes

Fixes:  
#5  
#6

See merge request !9

.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
 

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
 

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>