diff options
| author | soler_j <soler_j@etna-alternance.net> | 2025-04-27 22:35:46 +0200 |
|---|---|---|
| committer | soler_j <soler_j@etna-alternance.net> | 2025-04-27 22:35:46 +0200 |
| commit | e712ea658c0d2503eeee3bc24f563f730daeee3b (patch) | |
| tree | 0aa43cb297e12e79886b636c195ec1088cf55fa4 | |
| parent | 108e220e8f80f0ddb1ea67acfa8af6b4c620bb5d (diff) | |
Réorganiser les étapes du workflow de construction Docker pour le merge et la poussée des images multi-architecture, en ajoutant la connexion au registre et en simplifiant la structure des étapes.
| -rw-r--r-- | .github/workflows/build.yml | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 555622d..1091a2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,24 +62,33 @@ jobs: cache-to: type=gha,mode=max merge-and-push: - runs-on: ubuntu-latest - needs: build-api-image # This ensures the merge happens only after build is complete - permissions: - contents: read - packages: write + runs-on: ubuntu-latest + needs: build-api-image # This ensures the merge happens only after build is complete + permissions: + contents: read + packages: write + + steps: + - name: Log in to the Container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Pull amd64 image + run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64 + + - name: Pull arm64 image + run: docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64 + + - name: Merge Docker images and push multi-arch image + run: | + docker buildx imagetools create \ + --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64 \ + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64 + docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + - steps: - - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Merge Docker images and push multi-arch image - run: | - docker buildx imagetools create \ - --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:amd64 \ - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:arm64 - docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest |