diff --git a/.env b/.env index daf980d..822ccf0 100644 --- a/.env +++ b/.env @@ -109,5 +109,5 @@ STORAGE_SECRET=!ChangeMe! ###< league/flysystem-bundle ### ###> symfony/brevo-notifier ### -# BREVO_DSN=brevo://API_KEY@default?sender=SENDER +BREVO_DSN=brevo://API_KEY@default?sender=SENDER ###< symfony/brevo-notifier ### diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52bf249..b5c2653 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,11 +11,11 @@ jobs: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: plateforme-ebs-php + IMAGE_NAME: ebs-php BUILD_CONTEXT: . BUILD_TARGET: app_php REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ghcr.io/Apes-HDF + IMAGE_REPOSITORY: ghcr.io/Tipimi-fr 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: plateforme-ebs-caddy + IMAGE_NAME: ebs-caddy BUILD_CONTEXT: . BUILD_TARGET: app_caddy REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ghcr.io/Apes-HDF + IMAGE_REPOSITORY: ghcr.io/Tipimi-fr diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 04f80eb..6ae0a3a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -51,7 +51,7 @@ jobs: id: meta run: | set -xo pipefail - PROJECT=plateforme-ebs + PROJECT=tipimi-ebs # Tags are deployed in prod CONTEXT=prod ENVIRONMENT=prod diff --git a/Dockerfile b/Dockerfile index bb3bacf..4d3a1cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact + ARG PHP_VERSION=8.1.32 ARG CADDY_VERSION=2.10.0 @@ -190,6 +191,7 @@ FROM caddy:${CADDY_VERSION}-builder-alpine AS app_caddy_builder # FROM caddy:2.9.1-builder-alpine AS app_caddy_builder + # RUN xcaddy build \ # --with github.com/dunglas/mercure \ # --with github.com/dunglas/mercure/caddy \ diff --git a/helm/chart/values.yaml b/helm/chart/values.yaml index a0565d8..08f2711 100644 --- a/helm/chart/values.yaml +++ b/helm/chart/values.yaml @@ -4,7 +4,7 @@ php: image: - repository: "ghcr.io/apes-hdf/plateforme-ebs-php" # CHANGE ME + repository: "ghcr.io/tipimi-fr/ebs-php" # 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/apes-hdf/plateforme-ebs-caddy" # CHANGE ME + repository: "ghcr.io/tipimi-fr/ebs-caddy" # CHANGE ME pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: ""