diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7ac6a47f1589361de6515bb4d1e07f4fa5482de..1e4f9ee04631499c131c1459b74dedba25edb4d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ release:latest: release:python2.7: extends: .release needs: ['test:python2.7'] - script: + script: - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 2.16 - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python3.6 - crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python2.7 diff --git a/Dockerfile b/Dockerfile index 9979db1f74182d3b98297c38446d09cd093ee9e8..ab28956ab8604e3d086b2bdf7116f79688a32e13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,16 +9,7 @@ RUN apk add --update --no-cache \ ansible ansible-core~=${ANSIBLE_VERSION} # Add entrypoint script -COPY <<EOF /entrypoint.sh -#!/bin/sh -set -e - -cp -R /tmp/.ssh /root/.ssh -chown -R root:root /root/.ssh - -exec "\$@" -EOF - +COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000000000000000000000000000000000000..2ac80a8ebfc2aa2d783a9944b0c0e698bdca8460 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +cp -R /tmp/.ssh /root/.ssh +chown -R root:root /root/.ssh + +exec "$@" + +# vi: set ts=4 sw=4 et ft=sh: