From 4d6950e09400628ef1520ba7afe0dafa18a02ffd Mon Sep 17 00:00:00 2001
From: Dominik Chilla <dominik@zwackl.de>
Date: Tue, 9 Jul 2019 10:12:42 +0200
Subject: [PATCH] Dockerfile/entrypoint are Jenkins-ready now

---
 docker-build.sh          | 11 +----------
 docker/debian/Dockerfile |  7 ++++---
 entrypoint.sh            |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/docker-build.sh b/docker-build.sh
index 302a080..0e5adf5 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -3,7 +3,6 @@
 BRANCH="$(/usr/bin/git branch|/bin/grep \*|/usr/bin/awk {'print $2'})"
 VERSION="$(/bin/cat VERSION)"
 BASEOS="$(/bin/cat BASEOS)"
-#REGISTRY="some-registry.invalid"
 GO=""
 
 while getopts g opt
@@ -22,15 +21,7 @@ fi
 IMAGES="ldap-acl-milter"
 
 for IMAGE in ${IMAGES}; do
-#    --build-arg http_proxy=http://wprx-zdf.zwackl.local:3128 \
-#    --build-arg https_proxy=http://wprx-zdf.zwackl.local:3128 \
   /usr/bin/docker build \
-    -t "${IMAGE}/${BASEOS}:${VERSION}_${BRANCH}" \
+    -t "${IMAGE}:${BRANCH}" \
     -f "docker/${BASEOS}/Dockerfile" .
-#  /usr/bin/docker tag "${IMAGE}/${BASEOS}:${VERSION}_${BRANCH}" "${REGISTRY}/${IMAGE}/${BASEOS}:${VERSION}_${BRANCH}"
 done
-
-#/bin/echo "Push images to registry:"
-#for IMAGE in ${IMAGES}; do
-#  /bin/echo "/usr/bin/docker push ${REGISTRY}/${IMAGE}/${BASEOS}:${VERSION}_${BRANCH}"
-#done
diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
index b077732..1723a5b 100644
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@@ -2,7 +2,7 @@ ARG http_proxy
 ARG https_proxy
 FROM debian
 LABEL maintainer="Dominik Chilla <dominik@zwackl.de>"
-LABEL git_repo="https://github.com/chillout2k/ldap-acl-milter/tree/devel"
+LABEL git_repo="https://github.com/chillout2k/ldap-acl-milter"
 
 ENV DEBIAN_FRONTEND=noninteractive \
  TZ=Europe/Berlin
@@ -18,7 +18,8 @@ RUN env; set -ex ; \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-COPY app/*.py /app/
-COPY entrypoint.sh /entrypoint.sh
+ADD app/*.py /app/
+ADD entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/usr/bin/python3", "/app/ldap-acl-milter.py"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 4aea782..23819fe 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,4 +4,4 @@ set -x
 set -e
 umask 0000
 ulimit -n 1024
-/usr/bin/python3 /app/ldap-acl-milter.py
+exec "$@"