From b701ccf09c7e9d23f07789ce5a65c83230acf059 Mon Sep 17 00:00:00 2001 From: Bintou DIOP Date: Mon, 20 Oct 2025 01:34:40 +0200 Subject: [PATCH 1/6] configuration login azure --- .github/workflows/github-docker-cicd.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index 9d795a75..96a91ee9 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -57,10 +57,10 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build Docker image - run: docker build -t $DOCKER_USER/$REPO_NAME:latest ./pipeline + run: docker build -t ${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest ./pipeline - name: Push Docker image - run: docker push $DOCKER_USER/$REPO_NAME:latest + run: docker push ${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest - name: Login to Azure uses: azure/login@v1 @@ -69,15 +69,15 @@ jobs: - name: Deploy to Azure Web App run: | + echo "Déploiement de l'image Docker sur Azure..." az webapp config container set \ --name ${{ secrets.AZURE_WEBAPP_NAME }} \ --resource-group ${{ secrets.AZURE_RG }} \ - --container-image-name $DOCKER_USER/$REPO_NAME:latest \ + --docker-custom-image-name ${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest \ --docker-registry-server-url https://index.docker.io \ - --docker-registry-server-user $DOCKER_USER \ + --docker-registry-server-user ${{ secrets.DOCKER_USER }} \ --docker-registry-server-password ${{ secrets.DOCKER_PASSWORD }} - az webapp deployment container config \ --name ${{ secrets.AZURE_WEBAPP_NAME }} \ --resource-group ${{ secrets.AZURE_RG }} \ From 46b3f132281da5371512ad95d2b2d17148cafdd9 Mon Sep 17 00:00:00 2001 From: Bintou DIOP <152194217+BINTOUDIOP@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:55:30 +0200 Subject: [PATCH 2/6] Upgrade GitHub Actions to checkout@v4 --- .github/workflows/github-docker-cicd.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index 96a91ee9..e5eef036 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -13,6 +13,7 @@ on: branches: [ main ] pull_request: branches: [ main ] + workflow_dispatch: jobs: @@ -21,7 +22,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 @@ -81,4 +82,4 @@ jobs: az webapp deployment container config \ --name ${{ secrets.AZURE_WEBAPP_NAME }} \ --resource-group ${{ secrets.AZURE_RG }} \ - --enable-cd true \ No newline at end of file + --enable-cd true From 7b7bec68a56c62ede886afadeff8119ee49e5203 Mon Sep 17 00:00:00 2001 From: Bintou DIOP <152194217+BINTOUDIOP@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:57:20 +0200 Subject: [PATCH 3/6] Add 'test-ci' branch to CI workflow triggers --- .github/workflows/github-docker-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index e5eef036..0ffc13d7 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -10,7 +10,7 @@ env: on: push: - branches: [ main ] + branches: [ main, test-ci ] pull_request: branches: [ main ] workflow_dispatch: From ca28e563d868229cd9a24020ee5fbf292e5ccd75 Mon Sep 17 00:00:00 2001 From: Bintou DIOP <152194217+BINTOUDIOP@users.noreply.github.com> Date: Mon, 20 Oct 2025 23:07:57 +0200 Subject: [PATCH 4/6] Fix Docker image name syntax in CI/CD workflow --- .github/workflows/github-docker-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index 0ffc13d7..1436803c 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -74,7 +74,7 @@ jobs: az webapp config container set \ --name ${{ secrets.AZURE_WEBAPP_NAME }} \ --resource-group ${{ secrets.AZURE_RG }} \ - --docker-custom-image-name ${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest \ + --docker-custom-image-name "${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest" \ --docker-registry-server-url https://index.docker.io \ --docker-registry-server-user ${{ secrets.DOCKER_USER }} \ --docker-registry-server-password ${{ secrets.DOCKER_PASSWORD }} From 0f6d53a8d1b3f01349fc2bb36cde5b748b0d73d4 Mon Sep 17 00:00:00 2001 From: Bintou DIOP <152194217+BINTOUDIOP@users.noreply.github.com> Date: Mon, 20 Oct 2025 23:15:52 +0200 Subject: [PATCH 5/6] Fix formatting of docker registry server URL --- .github/workflows/github-docker-cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index 1436803c..5b096ff5 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -75,7 +75,7 @@ jobs: --name ${{ secrets.AZURE_WEBAPP_NAME }} \ --resource-group ${{ secrets.AZURE_RG }} \ --docker-custom-image-name "${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest" \ - --docker-registry-server-url https://index.docker.io \ + --docker-registry-server-url "https://index.docker.io" \ --docker-registry-server-user ${{ secrets.DOCKER_USER }} \ --docker-registry-server-password ${{ secrets.DOCKER_PASSWORD }} From 9acc92e217c225593aaa1313cdb3631588e1866f Mon Sep 17 00:00:00 2001 From: Bintou DIOP <152194217+BINTOUDIOP@users.noreply.github.com> Date: Mon, 20 Oct 2025 23:21:43 +0200 Subject: [PATCH 6/6] Fix formatting for Docker registry credentials --- .github/workflows/github-docker-cicd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-docker-cicd.yaml b/.github/workflows/github-docker-cicd.yaml index 5b096ff5..ed6cb53f 100644 --- a/.github/workflows/github-docker-cicd.yaml +++ b/.github/workflows/github-docker-cicd.yaml @@ -76,8 +76,8 @@ jobs: --resource-group ${{ secrets.AZURE_RG }} \ --docker-custom-image-name "${{ secrets.DOCKER_USER }}/${{ secrets.REPO_NAME }}:latest" \ --docker-registry-server-url "https://index.docker.io" \ - --docker-registry-server-user ${{ secrets.DOCKER_USER }} \ - --docker-registry-server-password ${{ secrets.DOCKER_PASSWORD }} + --docker-registry-server-user "${{ secrets.DOCKER_USER }}" \ + --docker-registry-server-password "${{ secrets.DOCKER_PASSWORD }}" az webapp deployment container config \ --name ${{ secrets.AZURE_WEBAPP_NAME }} \