From e841242584ac981ae733ba69e9da9631d3f880f4 Mon Sep 17 00:00:00 2001 From: Slim Amamou Date: Wed, 27 Aug 2025 10:47:06 +0100 Subject: [PATCH 1/4] Fix CICD does not work when merging from another repo (pull requests) --- .github/workflows/build.yml | 10 ++++++---- .github/workflows/cd.yml | 14 +++----------- .github/workflows/deploy.yml | 6 +++--- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b104e50..1b8ac31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,19 +5,21 @@ on: jobs: build-push-php: + environment: PROD runs-on: ubuntu-latest timeout-minutes: 15 steps: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: ${{ vars.IMAGE_NAME_PHP }} + IMAGE_NAME: ${{ env.IMAGE_NAME_PHP }} BUILD_CONTEXT: . BUILD_TARGET: app_php REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} + IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }} build-push-caddy: + environment: PROD # Same Dockerfile as php, with a build target which is after needs: [build-push-php] runs-on: ubuntu-latest @@ -26,8 +28,8 @@ jobs: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: ${{ vars.IMAGE_NAME_CADDY }} + IMAGE_NAME: ${{ env.IMAGE_NAME_CADDY }} BUILD_CONTEXT: . BUILD_TARGET: app_caddy REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} + IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }} diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 44a516e..4066f05 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,5 +1,8 @@ name: CD +env: + IMAGE_NAME_PHP: ebs-php + IMAGE_NAME_CADDY: ebs-caddy on: push: @@ -18,17 +21,6 @@ permissions: packages: write jobs: - # remove-deploy-label: - # name: Remove deploy label - # if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy') - # runs-on: ubuntu-latest - # steps: - # - uses: mondeja/remove-labels-gh-action@v1 - # with: - # token: ${{ secrets.GITHUB_TOKEN }} - # labels: | - # deploy - build: name: Build uses: ./.github/workflows/build.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 947e8be..9091317 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,12 +53,12 @@ jobs: id: meta run: | set -xo pipefail - PROJECT=${{ vars.PROJECT_NAME }} + PROJECT=${{ env.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 }} + PHP_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_PHP }} + CADDY_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_CADDY }} IMAGE_TAG=sha-${GITHUB_SHA::7} RELEASE_NAME=prod TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g') From a94316675c7da29d5270e3bc91ba990e32d91a76 Mon Sep 17 00:00:00 2001 From: Slim Amamou Date: Wed, 27 Aug 2025 13:51:44 +0100 Subject: [PATCH 2/4] Revert "Fix CICD does not work when merging from another repo (pull requests)" This reverts commit e841242584ac981ae733ba69e9da9631d3f880f4. --- .github/workflows/build.yml | 10 ++++------ .github/workflows/cd.yml | 14 +++++++++++--- .github/workflows/deploy.yml | 6 +++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b8ac31..b104e50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,21 +5,19 @@ on: jobs: build-push-php: - environment: PROD runs-on: ubuntu-latest timeout-minutes: 15 steps: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: ${{ env.IMAGE_NAME_PHP }} + IMAGE_NAME: ${{ vars.IMAGE_NAME_PHP }} BUILD_CONTEXT: . BUILD_TARGET: app_php REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }} + IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} build-push-caddy: - environment: PROD # Same Dockerfile as php, with a build target which is after needs: [build-push-php] runs-on: ubuntu-latest @@ -28,8 +26,8 @@ jobs: - name: Build/Push uses: coopTilleuls/action-docker-build-push@v10 with: - IMAGE_NAME: ${{ env.IMAGE_NAME_CADDY }} + IMAGE_NAME: ${{ vars.IMAGE_NAME_CADDY }} BUILD_CONTEXT: . BUILD_TARGET: app_caddy REGISTRY_JSON_KEY: ${{ secrets.GITHUB_TOKEN }} - IMAGE_REPOSITORY: ${{ env.IMAGE_REPO }} + IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4066f05..44a516e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,8 +1,5 @@ name: CD -env: - IMAGE_NAME_PHP: ebs-php - IMAGE_NAME_CADDY: ebs-caddy on: push: @@ -21,6 +18,17 @@ permissions: packages: write jobs: + # remove-deploy-label: + # name: Remove deploy label + # if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy') + # runs-on: ubuntu-latest + # steps: + # - uses: mondeja/remove-labels-gh-action@v1 + # with: + # token: ${{ secrets.GITHUB_TOKEN }} + # labels: | + # deploy + build: name: Build uses: ./.github/workflows/build.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9091317..947e8be 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -53,12 +53,12 @@ jobs: id: meta run: | set -xo pipefail - PROJECT=${{ env.PROJECT_NAME }} + PROJECT=${{ vars.PROJECT_NAME }} # Tags are deployed in prod CONTEXT=prod ENVIRONMENT=prod - PHP_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_PHP }} - CADDY_IMAGE_REPO=${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME_CADDY }} + 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') From 157b94c04de249adcb8dbf5fcaefb6a47112310f Mon Sep 17 00:00:00 2001 From: Slim Amamou Date: Wed, 27 Aug 2025 13:58:13 +0100 Subject: [PATCH 3/4] Fix CICD error saying inputs.IMAGE_REPOSITORY and .IMAGE_NAME are missing --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b104e50..0f836ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: jobs: build-push-php: + environment: PROD runs-on: ubuntu-latest timeout-minutes: 15 steps: @@ -18,6 +19,7 @@ jobs: IMAGE_REPOSITORY: ${{ vars.IMAGE_REPO }} build-push-caddy: + environment: PROD # Same Dockerfile as php, with a build target which is after needs: [build-push-php] runs-on: ubuntu-latest From 32eaf3f0c2ec8fec7aa86bb1fd23766091f749b7 Mon Sep 17 00:00:00 2001 From: Slim Amamou Date: Wed, 27 Aug 2025 14:24:37 +0100 Subject: [PATCH 4/4] Fix CICD error about wrong namespace "prod-" --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 947e8be..26a36e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,6 +34,7 @@ on: jobs: meta: + environment: PROD name: Meta runs-on: ubuntu-latest outputs: