diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7eab47b333ce06b15bc6fab4097eb01b9898ee3f..af5303664612004dd5571a2b895c63b45166d56d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,9 +220,14 @@ tests_release: script: - docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true - docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" -f $DOCKERFILE_PATH . + # Docker Hub - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:$IMAGE_TAG" - docker push "$DOCKER_HUB_PATH:$IMAGE_TAG" + # GitLab Container Registry + - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY + - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG" + - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" deploy_docker_test_image: extends: .docker-build-app-image @@ -245,9 +250,14 @@ deploy_docker_debug_sha: variables: IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA" after_script: + # Docker Hub - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:debug-latest" - docker push "$DOCKER_HUB_PATH:debug-latest" + # GitLab Container Registry + - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY + - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:debug-latest" + - docker push "$CI_REGISTRY_IMAGE:debug-latest" deploy_docker_release_sha: extends: .docker-build-app-image @@ -269,9 +279,14 @@ deploy_docker_release_tag: variables: IMAGE_TAG: "$CI_COMMIT_TAG" after_script: + # Docker Hub - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:latest" - docker push "$DOCKER_HUB_PATH:latest" + # GitLab Container Registry + - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY + - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest" + - docker push "$CI_REGISTRY_IMAGE:latest" dependencies: - build_release