diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a729c8665b687f5c5093c4a5a8ab4c62b5e6f7ab..69c8d2c5f768878eb48e234d31d2743854af2805 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,9 +217,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" "duniter/duniter-v2s:$IMAGE_TAG" - docker push "duniter/duniter-v2s:$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 @@ -242,9 +247,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 "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:debug-latest" + - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "duniter/duniter-v2s:debug-latest" - docker push "duniter/duniter-v2s: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 @@ -266,9 +276,14 @@ deploy_docker_release_tag: variables: IMAGE_TAG: "$CI_COMMIT_TAG" after_script: + # Docker Hub - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - - docker tag "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:latest" + - docker tag "CI_REGISTRY_IMAGE:$IMAGE_TAG" "duniter/duniter-v2s:latest" - docker push "duniter/duniter-v2s: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