diff --git a/Jenkinsfile.declarative b/Jenkinsfile.declarative index 5d3b372..2f7ada4 100644 --- a/Jenkinsfile.declarative +++ b/Jenkinsfile.declarative @@ -18,7 +18,7 @@ pipeline { stage('Test image') { steps { script { - dockerImage.inside("--entrypoint='/entrypoint_test.sh'") { + dockerImage.inside() { sh '/usr/bin/env' } } diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 1614eae..740d90d 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -21,6 +21,6 @@ RUN env; set -ex ; \ COPY app/*.py /app/ COPY entrypoint.sh /entrypoint.sh -COPY entrypoint_test.sh /entrypoint_test.sh ENTRYPOINT ["/entrypoint.sh"] +CMD ["/usr/bin/python3", "/app/sos-milter.py"] diff --git a/entrypoint.sh b/entrypoint.sh index 54fa615..b6842d3 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,4 +4,4 @@ set -x set -e umask 0000 ulimit -n 1024 -/usr/bin/python3 /app/sos-milter.py +#/usr/bin/python3 /app/sos-milter.py diff --git a/entrypoint_test.sh b/entrypoint_test.sh deleted file mode 100755 index 8df46ee..0000000 --- a/entrypoint_test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -/bin/sleep infinity