2 Commits

Author SHA1 Message Date
070bcbd845 add procps for kill 2021-02-02 13:25:25 +01:00
6f03f05ac4 use common build and publish approach 2020-09-26 12:32:15 +02:00
3 changed files with 6 additions and 28 deletions

View File

@ -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

View File

@ -6,7 +6,7 @@ LABEL HubImageName="wollud1969/httpdispatcher"
RUN \ RUN \
apt update && \ apt update && \
apt install -y ca-certificates curl && \ apt install -y ca-certificates curl procps && \
sed -i \ sed -i \
-e 's,^#\(LoadModule proxy_module modules/mod_proxy.so\),\1,' \ -e 's,^#\(LoadModule proxy_module modules/mod_proxy.so\),\1,' \
-e 's,^#\(LoadModule proxy_http_module modules/mod_proxy_http.so\),\1,' \ -e 's,^#\(LoadModule proxy_http_module modules/mod_proxy_http.so\),\1,' \
@ -26,7 +26,7 @@ RUN \
mkdir conf/editable/ssl/private && \ mkdir conf/editable/ssl/private && \
mkdir conf/editable/ssl/certs mkdir conf/editable/ssl/certs
COPY httpd-vhosts.conf conf/editable/ COPY httpd-vhosts.conf-template conf/editable/
VOLUME /usr/local/apache2/conf/editable VOLUME /usr/local/apache2/conf/editable
VOLUME /usr/local/apache2/logs VOLUME /usr/local/apache2/logs

View File

@ -1 +0,0 @@
0.1