new upstream image

.gitlab-ci.yml

@@ -1,25 +1,4 @@
-stages:
+include:
-        - dockerize
+        - project: dockerized/commons
-
+          ref: master
-variables:
+          file: gitlab-ci-template.yml
-        IMAGE_NAME: registry.hottis.de/dockerized/httpdispatcher
-        HUB_IMAGE_NAME: wollud1969/httpdispatcher
-
-
-dockerize:
-        stage: dockerize
-        image: wollud1969/docker-bash:0.3
-        tags:
-                - linux
-                - docker
-        script: 
-                - VERSION="$(cat VERSION).$(git rev-list --all --count).$CI_COMMIT_REF_NAME"
-                - cat httpd-vhosts.conf-template | sed -e 's/%AuthLDAPBindDN%/'"${AuthLDAPBindDN/\\/\\\\}"'/' -e 's/%AuthLDAPBindPassword%/'"${AuthLDAPBindPassword//&/\\&}"'/' -e 's@%AuthLDAPURL%@'"$AuthLDAPURL"'@' > httpd-vhosts.conf
-                - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest --tag $HUB_IMAGE_NAME:$VERSION .
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker push $IMAGE_NAME:latest
-                - docker push $IMAGE_NAME:$VERSION
-                - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
-                - docker push $HUB_IMAGE_NAME:latest
-                - docker push $HUB_IMAGE_NAME:$VERSION
-

Dockerfile

@@ -1,4 +1,4 @@
-FROM httpd:2.4
+FROM httpd:2.4.50
 
 LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
 LABEL ImageName="registry.hottis.de/dockerized/httpdispatcher"
@@ -6,7 +6,7 @@ LABEL HubImageName="wollud1969/httpdispatcher"
 
 RUN \
   apt update && \
-  apt install -y ca-certificates curl && \
+  apt install -y ca-certificates curl procps && \
   sed -i \
       -e 's,^#\(LoadModule proxy_module modules/mod_proxy.so\),\1,' \
       -e 's,^#\(LoadModule proxy_http_module modules/mod_proxy_http.so\),\1,' \
@@ -22,13 +22,16 @@ RUN \
       -e 's,^#\(Include conf/extra/httpd-vhosts.conf\),Include conf/editable/httpd-vhosts.conf,' \
       conf/httpd.conf && \
   mkdir conf/editable && \
-  mkdir conf/editable/ssl && \
+  mkdir conf/ssl && \
-  mkdir conf/editable/ssl/private && \
+  mkdir conf/ssl/private && \
-  mkdir conf/editable/ssl/certs 
+  mkdir conf/ssl/certs && \
+  mkdir conf/ssl/notify 
 
-COPY httpd-vhosts.conf conf/editable/
+COPY httpd-vhosts.conf-template conf/editable/
+COPY notify.sh /usr/bin/
 
 VOLUME /usr/local/apache2/conf/editable
+VOLUME /usr/local/apache2/conf/ssl
 VOLUME /usr/local/apache2/logs
 
 EXPOSE 443/tcp

VERSION

@@ -1 +0,0 @@
-0.1

httpd-vhosts.conf-template

@@ -20,6 +20,9 @@ SSLSessionCacheTimeout  300
 
 ServerAdmin admin@example.com
 MDCertificateAgreement accepted
+MDNotifyCmd /usr/bin/notify.sh
+MDStoreDir /usr/local/apache2/conf/ssl
+
 
 
 # Example on usage on above LDAPAuthConfig macro

notify.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+date +%s > /usr/local/apache2/conf/ssl/notify/md-$1-done
+
+exit 0
+