diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50d0241..1959a8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ stages: variables: BUILT_IMAGE_TAG: built_image - IMAGE_TAG: $CI_REGISTRY_IMAGE - DOCKER_HUB_IMAGE_TAG: "skobkin/murmur:latest" + IMAGE_TAG: ${CI_REGISTRY_IMAGE} + DOCKER_HUB_IMAGE_TAG: skobkin/murmur DOCKER_HUB_LOGIN: skobkin DOCKER_HUB_TOKEN: "xxx" @@ -27,20 +27,28 @@ push-gitlab-registry: services: - docker:20.10.12-dind stage: push + only: + - tags script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker load -i images.tar - docker tag $BUILT_IMAGE_TAG $IMAGE_TAG + - docker tag $BUILT_IMAGE_TAG $IMAGE_TAG:$CI_COMMIT_TAG - docker push $IMAGE_TAG + - docker push $IMAGE_TAG:$CI_COMMIT_TAG push-docker-hub-registry: image: docker:20.10.12 services: - docker:20.10.12-dind stage: push + only: + - tags script: - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_TOKEN - docker load -i images.tar - docker tag $BUILT_IMAGE_TAG $DOCKER_HUB_IMAGE_TAG + - docker tag $BUILT_IMAGE_TAG $DOCKER_HUB_IMAGE_TAG:$CI_COMMIT_TAG - docker push $DOCKER_HUB_IMAGE_TAG + - docker push $DOCKER_HUB_IMAGE_TAG::$CI_COMMIT_TAG