From ab56f521a99d8ff2b45440812110d99cc6e63399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lo=C3=AFs?= <elois@ifee.fr>
Date: Sun, 4 Aug 2019 16:46:09 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d0f3f3..c66c11d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,7 @@
-image: docker:19.03
-
-variables:
- DOCKER_TLS_CERTDIR: "/certs"
- DOCKER_DRIVER: overlay2
+image: docker:18.06
services:
- - docker:19.03-dind
+ - docker:18.06-dind
before_script:
- docker info
@@ -13,8 +9,6 @@ before_script:
test_build_image:
tags:
- dunitrust
- services:
- - docker:dind
script:
- docker build .
except:
@@ -23,12 +17,13 @@ test_build_image:
build_image:
tags:
- dunitrust
- services:
- - docker:dind
script:
+ - docker pull "$CI_REGISTRY_IMAGE:latest" || true
+ - docker build --cache-from "$CI_REGISTRY_IMAGE:latest" --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" .
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" .
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
+ - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_TAG $CI_REGISTRY_IMAGE:latest
- docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG"
+ - docker push "$CI_REGISTRY_IMAGE:latest"
+
only:
- tags
--
GitLab