From b2b7fab7b18128e7fa8cc71f0ab42c49d988151a Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Mon, 18 Jun 2018 09:34:10 +0200 Subject: [PATCH] CI: speed up the docker_check stage There is no point in login in to the registry if there is no need to create a new docker image. Reviewed-by: Peter Hutterer Signed-off-by: Benjamin Tissoires --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 189461d..9860ad6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,12 +191,12 @@ ubuntu:18.04@docker-check: stage: docker_prep services: - docker:dind - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: # if the check was successful, we just skip recreating the docker image - test -e .img_ready && exit 0 + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + # create a Dockerfile with our dependencies - echo "FROM fedora:$FEDORA_VERSION" > Dockerfile - echo "WORKDIR /app" >> Dockerfile @@ -233,12 +233,12 @@ fedora:27@docker-prep: stage: docker_prep services: - docker:dind - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: # if the check was successful, we just skip recreating the docker image - test -e .img_ready && exit 0 + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + # create a Dockerfile with our dependencies - echo "FROM ubuntu:$UBUNTU_VERSION" > Dockerfile - echo "WORKDIR /app" >> Dockerfile -- 2.7.4