diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7fd2ee277caa725fe40b087e2ab958c91d0bdc2..47a1fbe6214861bed36cfeee808fe95cf7b23833 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,6 @@ stages: - build - security-tests - push - - clean # Hidden key meant to be included in other jobs, for factorization .pull-modified-image: &pull-modified-image @@ -172,10 +171,3 @@ push-prod: - "pica-oh-my-form/*" refs: - master - -# Remove cached variables once all pipeline passed -clean-up: - stage: clean - tags: [build] - script: - - rm variables diff --git a/get-modified-image.sh b/get-modified-image.sh index 638292b465b489ab5bc4cbcb92d66755a3752ab7..4b440fa2118cb9ae2efa2f2b215ec13121d43ee4 100755 --- a/get-modified-image.sh +++ b/get-modified-image.sh @@ -14,7 +14,7 @@ do ;; esac done -echo "export MODIFIED_IMAGE=${RES}" >> variables +echo "export MODIFIED_IMAGE=${RES}" > variables # Image name with wanted registry and tag, fetched from Docker Compose RES=$(cat $RES/docker-compose.yml | grep $RES | cut -d ':' -f2-) diff --git a/pica-ci-base/Dockerfile b/pica-ci-base/Dockerfile index ad9b1d06c5660d1c5d473cebbe9dfaa8de42af03..669fc7629202d0390da0e39905d14f727a08b66c 100644 --- a/pica-ci-base/Dockerfile +++ b/pica-ci-base/Dockerfile @@ -8,5 +8,5 @@ RUN apk update && \ py-pip \ python2-dev \ sed \ - wget && \ - pip install docker-compose + wget \ + && pip install docker-compose