From 8adfe41f810954644b0f78880978d635ad413acb Mon Sep 17 00:00:00 2001
From: Paul Gaucher <paul@paulinformatique.com>
Date: Wed, 4 Dec 2024 15:28:42 +0100
Subject: [PATCH] fix: mise a jour du prefix des image docker avec le user
 group

---
 .bin/scripts/release/build-image.sh               | 4 ++--
 .infra/files/app/docker-compose.system.yml.jinja2 | 2 +-
 products/infra/infra-meta.sh                      | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.bin/scripts/release/build-image.sh b/.bin/scripts/release/build-image.sh
index 6c9bd23..4b0a5b4 100755
--- a/.bin/scripts/release/build-image.sh
+++ b/.bin/scripts/release/build-image.sh
@@ -110,8 +110,8 @@ set -e
 echo "Building $TAG_PREFIX:$NEXT_VERSION ..."
 docker buildx build "$ROOT_DIR/$TAG_PREFIX" \
       --platform linux/amd64,linux/arm64 \
-      --tag ghcr.io/$GITHUB_ORGANIZATION/infra_$TAG_PREFIX:"$NEXT_VERSION" \
-      --tag ghcr.io/$GITHUB_ORGANIZATION/infra_$TAG_PREFIX:$(get_channel $NEXT_VERSION) \
+      --tag ghcr.io/$GITHUB_ORGANIZATION/${USER_GROUP}_$TAG_PREFIX:"$NEXT_VERSION" \
+      --tag ghcr.io/$GITHUB_ORGANIZATION/${USER_GROUP}_$TAG_PREFIX:$(get_channel $NEXT_VERSION) \
       --label "org.opencontainers.image.source=$REPO_INFRA" \
       --label "org.opencontainers.image.description=$TAG_PREFIX Infra" \
       --label "org.opencontainers.image.version=$NEXT_VERSION" \
diff --git a/.infra/files/app/docker-compose.system.yml.jinja2 b/.infra/files/app/docker-compose.system.yml.jinja2
index 21e6789..9ad07d4 100644
--- a/.infra/files/app/docker-compose.system.yml.jinja2
+++ b/.infra/files/app/docker-compose.system.yml.jinja2
@@ -24,7 +24,7 @@ x-default: &default
 services:
   reverse_proxy:
     <<: *default
-    image: ghcr.io/{{github_organization}}/infra_reverse_proxy:{{reverse_proxy_version}}
+    image: ghcr.io/{{github_organization}}/{{user_group}}_reverse_proxy:{{reverse_proxy_version}}
     deploy:
       <<: *deploy-default
       restart_policy:
diff --git a/products/infra/infra-meta.sh b/products/infra/infra-meta.sh
index 04975bb..b60a2ef 100644
--- a/products/infra/infra-meta.sh
+++ b/products/infra/infra-meta.sh
@@ -4,4 +4,5 @@ set -euo pipefail
 export GITHUB_ORGANIZATION=mission-apprentissage
 export REPO_INFRA=mission-apprentissage/infra
 export OP_VAULT_PASSWORD=mna-vault-passwords-common
-export OP_ACCOUNT=mission-apprentissage.1password.com
\ No newline at end of file
+export OP_ACCOUNT=mission-apprentissage.1password.com
+export USER_GROUP=mna
\ No newline at end of file