diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2018-06-18 09:34:10 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2018-06-19 10:41:43 +0200 |
| commit | b2b7fab7b18128e7fa8cc71f0ab42c49d988151a (patch) | |
| tree | f748233fcd4af3b81fe67cc213efc0d7209d770d /.gitlab-ci.yml | |
| parent | ca60c67bc1e2e247372268dae26864ae3fb6d223 (diff) | |
| download | libinput-b2b7fab7b18128e7fa8cc71f0ab42c49d988151a.tar.gz | |
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 <peter.hutterer@who-t.net>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 189461d6..9860ad65 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 |