diff --git a/Dockerfile b/Dockerfile index ce2f37a..df1479f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN \ sed -i 's/listen\s\+80;/listen 8080;/' /etc/nginx/conf.d/default.conf && \ sed -i 's/index index.html index.htm;/index mdwiki.html;/' /etc/nginx/conf.d/default.conf && \ sed -i 's,pid\s\+/run/nginx.pid;,pid /tmp/nginx.pid;,' /etc/nginx/nginx.conf && \ - dd if=/dev/random of=/usr/share/nginx/html/numbers bs=1024 count=1000000 USER nobody # ------------ EXPOSE 8080 diff --git a/content/about.md b/content/about.md index 3634865..c6073d8 100644 --- a/content/about.md +++ b/content/about.md @@ -1,4 +1,5 @@ [Wolfgang Hottgenroth](mailto:woho@hottis.de) +Tag: %TAG% diff --git a/deployment/deploy.sh b/deployment/deploy.sh index 1a5b78c..6e5fe5d 100755 --- a/deployment/deploy.sh +++ b/deployment/deploy.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -ex + if [ "$IMAGE_TAG" == "" ]; then echo "Make sure IMAGE_TAG is set" @@ -18,6 +20,7 @@ kubectl create namespace $NAMESPACE \ kubectl -f - apply +sed -i 's,%TAG%,'$IMAGE_TAG','g content/about.md cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \ sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \ kubectl apply -f - -n $NAMESPACE