Fix wrong image registry was mistakenly configured during merge

Now CICD depends on env vars IMAGE_REPO, IMAGE_NAME_PHP, IMAGE_NAME_CADDY and PROJECT_NAME

.github/workflows/build.yml

@@ -11,11 +11,11 @@ jobs:
     - name: Build/Push
       uses: coopTilleuls/action-docker-build-push@v10
       with:
-        IMAGE_NAME: ebs-php
+        IMAGE_NAME: ${{ vars.IMAGE_NAME_PHP }}
         BUILD_CONTEXT: .
         BUILD_TARGET: app_php
         REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
-        IMAGE_REPOSITORY: ghcr.io/Tipimi-fr
+        IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }}
          
   build-push-caddy:
     # Same Dockerfile as php, with a build target which is after
@@ -26,8 +26,8 @@ jobs:
     - name: Build/Push
       uses: coopTilleuls/action-docker-build-push@v10
       with:
-        IMAGE_NAME: ebs-caddy
+        IMAGE_NAME: ${{ vars.IMAGE_NAME_CADDY }}
         BUILD_CONTEXT: .
         BUILD_TARGET: app_caddy
         REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }}
-        IMAGE_REPOSITORY: ghcr.io/Tipimi-fr
+        IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }}

.github/workflows/deploy.yml

@@ -39,6 +39,8 @@ jobs:
     outputs:
       context: ${{ steps.meta.outputs.context }}
       environment: ${{ steps.meta.outputs.environment }}
+      php_image_repo: ${{ steps.meta.outputs.php_image_repo }}
+      caddy_image_repo: ${{ steps.meta.outputs.caddy_image_repo }}
       image_tag: ${{ steps.meta.outputs.image_tag }}
       release_name: ${{ steps.meta.outputs.release_name }}
       url: ${{ steps.meta.outputs.url }}
@@ -51,10 +53,12 @@ jobs:
         id: meta
         run: |
           set -xo pipefail
-          PROJECT=tipimi-ebs
+          PROJECT=${{ vars.PROJECT_NAME }}
           # Tags are deployed in prod
           CONTEXT=prod
           ENVIRONMENT=prod
+          PHP_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_PHP }}
+          CADDY_IMAGE_REPO=${{ vars.IMAGE_REPO }}/${{ vars.IMAGE_NAME_CADDY }}
           IMAGE_TAG=sha-${GITHUB_SHA::7}
           RELEASE_NAME=prod
           TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g')
@@ -63,6 +67,8 @@ jobs:
           echo "context=${CONTEXT}" >> $GITHUB_OUTPUT
           echo "environment=${ENVIRONMENT}" >> $GITHUB_OUTPUT
           echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT
+          echo "php_image_repo=${PHP_IMAGE_REPO}" >> $GITHUB_OUTPUT
+          echo "caddy_image_repo=${CADDY_IMAGE_REPO}" >> $GITHUB_OUTPUT
           echo "release_name=${RELEASE_NAME}" >> $GITHUB_OUTPUT
           echo "namespace=${CONTEXT}-${PROJECT}" >> $GITHUB_OUTPUT
 
@@ -118,7 +124,9 @@ jobs:
             --atomic \
             --debug \
             --namespace ${{ needs.meta.outputs.namespace }} \
+            --set=php.image.repository=${{ needs.meta.outputs.php_image_repo }} \
             --set=php.image.tag=${{ needs.meta.outputs.image_tag }} \
+            --set=caddy.image.repository=${{ needs.meta.outputs.caddy_image_repo }} \
             --set=caddy.image.tag=${{ needs.meta.outputs.image_tag }} \
             --set=ingress.hosts[0].host=${{ vars.DOMAIN }} \
             --set=ingress.tls[0].secretName=${{ needs.meta.outputs.release_name }}-tls \

helm/chart/values.yaml

@@ -4,7 +4,7 @@
 
 php:
   image:
-    repository: "ghcr.io/tipimi-fr/ebs-php" # CHANGE ME
+    repository: "CHANGE/ME" # CHANGE ME
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
@@ -57,7 +57,7 @@ consumer:
 
 caddy:
   image:
-    repository: "ghcr.io/tipimi-fr/ebs-caddy" # CHANGE ME
+    repository: "CHANGE/ME" # CHANGE ME
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""