From ab56758197b262048ac30f4d77d75d3b2c8b9bdc Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 17 Sep 2018 22:05:58 -0400 Subject: [PATCH] Pull the image from GitLab's registry before attempting to uploading to Docker's registry. Signed-off-by: Roberto Rosario --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13c6f1bdd1..cd781434ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,9 @@ job_docker_master: image: docker:latest services: - docker:dind - script: + before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + script: - docker build --pull -t "$CI_REGISTRY_IMAGE" -f docker/Dockerfile . - VERSION=`cat docker/version` - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$VERSION" @@ -30,6 +31,7 @@ job_docker_master: services: - docker:dind script: + - docker pull "$CI_REGISTRY_IMAGE:$VERSION" - docker login -u "$DOCKER_HUB_USERNAME" -p "$DOCKER_HUB_PASSWORD" https://registry-1.docker.io - docker push registry-1.docker.io/mayanedms/mayanedms:"$VERSION" - docker push registry-1.docker.io/mayanedms/mayanedms:latest