From f2e64f754416d5a853a96c54e3d4f939a23525cc Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Sat, 21 Dec 2024 17:04:20 +0100
Subject: [PATCH] fix docker scout organization

---
 .github/workflows/release_branch.yml   | 1 +
 .github/workflows/release_stable.yml   | 8 ++++++++
 .github/workflows/release_testing.yml  | 1 +
 .github/workflows/release_unstable.yml | 1 +
 4 files changed, 11 insertions(+)

diff --git a/.github/workflows/release_branch.yml b/.github/workflows/release_branch.yml
index 815c823..ae4892e 100644
--- a/.github/workflows/release_branch.yml
+++ b/.github/workflows/release_branch.yml
@@ -66,6 +66,7 @@ jobs:
           command: environment,quickview,cves,recommendations
           image: ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ github.ref_name }}
           environment: stable
+          organization: ${{ env.DOCKER_NAMESPACE }}
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/release_stable.yml b/.github/workflows/release_stable.yml
index 17f591f..0c4aaa2 100644
--- a/.github/workflows/release_stable.yml
+++ b/.github/workflows/release_stable.yml
@@ -59,6 +59,12 @@ jobs:
           SUMMARY=$'Image ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ steps.dotclear.outputs.tag }} found.'
           echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
 
+      - name: rebuild
+        if: ((steps.registry.outputs.image_exists == 'truye') && (github.event.inputs.force_rebuild == 'true'))
+        run: |
+          SUMMARY=$'Rebuilding image ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ steps.dotclear.outputs.tag }} is forced.'
+          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
+
       - name: Check repository branch
         id: branch
         uses: GuillaumeFalourd/branch-exists@v1.1
@@ -151,6 +157,7 @@ jobs:
           command: environment,quickview,cves,recommendations
           image: ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ needs.check_image.outputs.version }}
           environment: stable
+          organization: ${{ env.DOCKER_NAMESPACE }}
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -161,6 +168,7 @@ jobs:
           command: environment,quickview,cves,recommendations
           image: ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:latest
           environment: latest
+          organization: ${{ env.DOCKER_NAMESPACE }}
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/release_testing.yml b/.github/workflows/release_testing.yml
index 4fd8ca8..5d5e892 100644
--- a/.github/workflows/release_testing.yml
+++ b/.github/workflows/release_testing.yml
@@ -99,6 +99,7 @@ jobs:
           command: environment,quickview,cves,recommendations
           image: ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ env.DOTCLEAR_CANAL }}
           environment: testing
+          organization: ${{ env.DOCKER_NAMESPACE }}
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/release_unstable.yml b/.github/workflows/release_unstable.yml
index b75df15..2ce98f4 100644
--- a/.github/workflows/release_unstable.yml
+++ b/.github/workflows/release_unstable.yml
@@ -66,6 +66,7 @@ jobs:
           command: environment,quickview,cves,recommendations
           image: ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:dev
           environment: unstable
+          organization: ${{ env.DOCKER_NAMESPACE }}
           write-comment: true
           github-token: ${{ secrets.GITHUB_TOKEN }}