From eb59c1e5c862e1c9fc4362270ceae5108c2b3446 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 9 Dec 2019 15:33:09 +0100
Subject: [PATCH] Trigger pica-ci-base build
---
.gitlab-ci.yml | 8 --------
get-modified-image.sh | 2 +-
pica-ci-base/Dockerfile | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7fd2ee2..47a1fbe6 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 638292b4..4b440fa2 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 ad9b1d06..669fc762 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
--
GitLab