add merging steps for images

Author: CamJN

.github/workflows/main.yml

@@ -112,9 +112,7 @@ jobs:
         run: |
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
           echo "TESTBOX_IMAGE_VERSION=$(./internal/lib/docker_image_info.sh testbox_version)" >> $GITHUB_ENV
-          export "TESTBOX_BASE_NAME=$(./internal/lib/docker_image_info.sh testbox_base_name)"
-          echo "TESTBOX_BASE_NAME=$TESTBOX_BASE_NAME" >> $GITHUB_ENV
-          echo "TESTBOX_IMAGE_NAME=${TESTBOX_BASE_NAME}_${distro//el/rocky_}" >> $GITHUB_ENV
+          echo "TESTBOX_IMAGE_NAME=$(./internal/lib/docker_image_info.sh testbox_base_name)_rocky_${distro##el}" >> $GITHUB_ENV
           echo "DISTRO_NUM=${distro##el}" >> $GITHUB_ENV
         env:
           platform: linux/${{ matrix.arch.name }}
@@ -170,3 +168,107 @@ jobs:
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
+
+
+  merge-buildbox:
+    runs-on: ubuntu-latest
+    needs:
+      - build-buildbox
+    steps:
+      - uses: actions/checkout@v4
+      - name: Prepare env
+        run: |
+          echo "BUILDBOX_IMAGE_VERSION=$(./internal/lib/docker_image_info.sh buildbox_version)" >> $GITHUB_ENV
+          echo "BUILDBOX_IMAGE_NAME=$(./internal/lib/docker_image_info.sh buildbox_name)" >> $GITHUB_ENV
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-buildbox-*
+          merge-multiple: true
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ env.BUILDBOX_IMAGE_NAME }}
+          tags: |
+            type=raw,value=${{ env.BUILDBOX_IMAGE_VERSION }}
+            type=raw,value=latest
+            type=edge,enable=true,priority=700,prefix=,suffix=,branch=$repo.default_branch
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") $(printf 'ghcr.io/${{ env.BUILDBOX_IMAGE_NAME }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: docker buildx imagetools inspect ghcr.io/${{ env.BUILDBOX_IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+
+
+  merge-testboxes:
+    name: Merge ${{ matrix.distro }} Testbox images
+    runs-on: ubuntu-latest
+    needs:
+      - define-matrix
+      - build-testboxes
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Prepare env
+        run: |
+          echo "TESTBOX_IMAGE_VERSION=$(./internal/lib/docker_image_info.sh testbox_version)" >> $GITHUB_ENV
+          echo "TESTBOX_IMAGE_NAME=$(./internal/lib/docker_image_info.sh testbox_base_name)_rocky_${distro##el}" >> $GITHUB_ENV
+          echo "DISTRO_NUM=${distro##el}" >> $GITHUB_ENV
+        env:
+          distro: ${{ matrix.distro }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-${{ matrix.distro }}-*
+          merge-multiple: true
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ env.TESTBOX_IMAGE_NAME }}
+          tags: |
+            type=raw,value=${{ env.TESTBOX_IMAGE_VERSION }}
+            type=raw,value=latest
+            type=edge,enable=true,priority=700,prefix=,suffix=,branch=$repo.default_branch
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") $(printf 'ghcr.io/${{ env.TESTBOX_IMAGE_NAME }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: docker buildx imagetools inspect ghcr.io/${{ env.TESTBOX_IMAGE_NAME }}:${{ steps.meta.outputs.version }}