ci: Fix workflow checkouts and add manifest tests

Signed-off-by: Evan Wies <evan@neomantra.net>

Author: neomantra

.github/workflows/docker-publish.yml

@@ -320,6 +320,9 @@ jobs:
       matrix:
         flavor: [alpine, alpine-slim, alpine-apk, amzn2, rocky, centos, centos7, fedora, bookworm, bookworm-buildpack, bullseye, bullseye-debug, bullseye-valgrind, bionic, focal, jammy, noble]
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -454,6 +457,9 @@ jobs:
       matrix:
         flavor: [bookworm-fat, bullseye-fat, alpine-fat]
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

scripts/create-manifest.sh

@@ -24,8 +24,8 @@ if [[ -z "$REGISTRY_IMAGE" ]]; then
 fi
 
 # Define architectures for each flavor
-# Default to amd64 and arm64
-ARCHS="amd64 arm64"
+# Default to amd64 and arm64, can be overridden by RESTY_ARCHS env var
+ARCHS="${RESTY_ARCHS:-amd64 arm64}"
 
 # Add s390x for Ubuntu flavors
 UBUNTU_FLAVORS=("bionic" "focal" "jammy" "noble")

tests/e2e/local-test.yml

@@ -54,7 +54,22 @@ jobs:
       - name: Tag and Push to Mirror
         run: |
           for TAG in ${{ steps.meta.outputs.tags }}; do
-            # Replace port 5001 with 5002 for the mirror
-            DOCKERHUB_TAG=$(echo "$TAG" | sed "s|5001|5002|")
+            # Replace GHCR_IMAGE with DOCKERHUB_IMAGE
+            DOCKERHUB_TAG=$(echo "$TAG" | sed "s|${{ env.GHCR_IMAGE }}|${{ env.DOCKERHUB_IMAGE }}|")
             docker buildx imagetools create -t "$DOCKERHUB_TAG" "$TAG"
           done
+
+  manifest:
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        flavor: [alpine-apk-test]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create and Push Manifest
+        env:
+          RESTY_ARCHS: "amd64"
+        run: ./scripts/create-manifest.sh "${{ matrix.flavor }}" "${{ env.GHCR_IMAGE }}" "${{ env.DOCKERHUB_IMAGE }}" "true"

tests/e2e/run-test.sh

@@ -17,7 +17,7 @@ act workflow_dispatch \
     --network host
 
 echo "Test complete. Verifying images..."
-docker pull localhost:5001/neomantra/openresty:alpine-apk-test-amd64
-docker pull localhost:5002/openresty/openresty:alpine-apk-test-amd64
+docker pull --platform linux/amd64 localhost:5001/neomantra/openresty:alpine-apk-test-amd64
+docker pull --platform linux/amd64 localhost:5002/openresty/openresty:alpine-apk-test-amd64
 
 echo "✅ verification successful!"