From dc5de91bfcec93f0feef7d3088249f382beacf2e Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 10 Mar 2023 12:24:02 +0100
Subject: [PATCH] ci: Define globally DOCKER_HUB_PATH variable
Use $CI_REGISTRY_IMAGE as base for image tagging
---
.gitlab-ci.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a729c8665..7eab47b33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,9 @@ stages:
- deploy
- deploy_readme
+variables:
+ DOCKER_HUB_PATH: "duniter/duniter-v2s"
+
workflow:
rules:
- changes:
@@ -218,8 +221,8 @@ tests_release:
- 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 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"
+ - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:$IMAGE_TAG"
+ - docker push "$DOCKER_HUB_PATH:$IMAGE_TAG"
deploy_docker_test_image:
extends: .docker-build-app-image
@@ -243,8 +246,8 @@ deploy_docker_debug_sha:
IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- - docker tag "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:debug-latest"
- - docker push "duniter/duniter-v2s:debug-latest"
+ - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:debug-latest"
+ - docker push "$DOCKER_HUB_PATH:debug-latest"
deploy_docker_release_sha:
extends: .docker-build-app-image
@@ -267,8 +270,8 @@ deploy_docker_release_tag:
IMAGE_TAG: "$CI_COMMIT_TAG"
after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- - docker tag "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:latest"
- - docker push "duniter/duniter-v2s:latest"
+ - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$DOCKER_HUB_PATH:latest"
+ - docker push "$DOCKER_HUB_PATH:latest"
dependencies:
- build_release
@@ -284,7 +287,7 @@ readme_docker_release_tag:
DOCKER_USER: "duniterteam"
DOCKER_PASS: "$DUNITERTEAM_PASSWD"
PUSHRM_SHORT: "Duniter v2 based on Substrate framework"
- PUSHRM_TARGET: "docker.io/duniter/duniter-v2s"
+ PUSHRM_TARGET: "docker.io/$DOCKER_HUB_PATH"
PUSHRM_DEBUG: 1
PUSHRM_FILE: "$CI_PROJECT_DIR/docker/README.md"
script: "/bin/true"
--
GitLab