From 1d958760337544c906a1fe9c024b5cca8c82d05e Mon Sep 17 00:00:00 2001 From: Jure Triglav <juretriglav@gmail.com> Date: Fri, 14 Aug 2020 10:00:03 +0200 Subject: [PATCH] ci: quick fix for docker build command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f98dfdbb3..ce94dec3cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ build: - if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi - docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD - docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true - - docker build --cache-from $CI_REGISTRY_IMAGE:latest -tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA $IMAGE_ORG/$IMAGE_NAME:latest . + - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest . - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA - docker push $IMAGE_ORG/$IMAGE_NAME:latest -- GitLab