From 7ae5a7ccb6615b451621230250d5eec8a12e2d10 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Mon, 29 Jan 2018 11:59:44 +0100
Subject: [PATCH] Fix gitlab-ci
CI_COMMIT_REF_NAME is the branch or tag name
1. When pushing a tag the TEST_IMAGE doesn't exist. We always pull master
for cache.
2. Make sure the pull of the cache image doesn't fail even if the image
doesn't exist
---
.gitlab-ci.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba1bd4b..f97228e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ services:
variables:
CONTAINER_TEST_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
CONTAINER_RELEASE_IMAGE: "$CI_REGISTRY_IMAGE:latest"
- CONTAINER_TAG_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+ CONTAINER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE:master"
stages:
- build
@@ -24,8 +24,8 @@ build:
<<: *runner_tags
stage: build
script:
- - docker pull "$CONTAINER_TEST_IMAGE"
- - docker build --pull --cache-from "$CONTAINER_TEST_IMAGE" -t "$CONTAINER_TEST_IMAGE" .
+ - docker pull "$CONTAINER_CACHE_IMAGE" || true
+ - docker build --pull --cache-from "$CONTAINER_CACHE_IMAGE" -t "$CONTAINER_TEST_IMAGE" .
- docker push "$CONTAINER_TEST_IMAGE"
test:
@@ -50,8 +50,6 @@ release-image:
script:
- docker pull "$CONTAINER_TEST_IMAGE"
- docker tag "$CONTAINER_TEST_IMAGE" "$CONTAINER_RELEASE_IMAGE"
- - docker tag "$CONTAINER_TEST_IMAGE" "$CONTAINER_TAG_IMAGE"
- docker push "$CONTAINER_RELEASE_IMAGE"
- - docker push "$CONTAINER_TAG_IMAGE"
only:
- tags
--
GitLab