load after build for buildx

Signed-off-by: David Justice <david@devigned.com>

Author: devigned

.github/workflows/ci.yaml

@@ -12,17 +12,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Docker
-        uses: docker/setup-docker-action@v4
-        with:
-          version: type=image,tag=latest
-          daemon-config: |
-            {
-              "debug": true,
-              "features": {
-                "containerd-snapshotter": true
-              }
-            }
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Checkout
         uses: actions/checkout@v4
       - name: setup-tools

base-images/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 
 DEFAULT_PREFIX=wasm/demo-base
 DEFAULT_PLATFORM="linux/amd64,linux/arm64"
@@ -50,25 +50,38 @@ fi
 
 cd $(dirname $0)
 
-IMAGE_DIR=$(realpath "${BASE_DIR}")
-TAG=$(basename "${IMAGE_DIR}")
+TAG="${ENV_VAR:-latest}"
 BASE_IMAGE=heroku/heroku:24-build
 RUN_IMAGE=${REPO_PREFIX}-run:${TAG}
 BUILD_IMAGE=${REPO_PREFIX}-build:${TAG}
 
+docker buildx ls
+
 echo "BUILDING ${BUILD_IMAGE}..."
-docker buildx build --load \
+docker buildx build \
 	--platform "${PLATFORM}" \
 	--build-arg "BASE_IMAGE=${BASE_IMAGE}" \
 	-t "${BUILD_IMAGE}" \
-	"${IMAGE_DIR}/build"
+	"${BASE_DIR}/build"
 
-echo "BUILDING ${RUN_IMAGE}..."
 docker buildx build --load \
+	--build-arg "BASE_IMAGE=${BASE_IMAGE}" \
+	-t "${BUILD_IMAGE}" \
+	"${BASE_DIR}/build"
+
+docker buildx build --load -t "${BUILD_IMAGE}" ${BASE_DIR}/build
+
+echo "BUILDING ${RUN_IMAGE}..."
+docker buildx build \
 	--platform "${PLATFORM}" \
 	--build-arg "BASE_IMAGE=${BUILD_IMAGE}" \
 	-t "${RUN_IMAGE}" \
-	"${IMAGE_DIR}/run"
+	"${BASE_DIR}/run"
+
+docker buildx build --load \
+	--build-arg "BASE_IMAGE=${BUILD_IMAGE}" \
+	-t "${RUN_IMAGE}" \
+	"${BASE_DIR}/run"
 
 echo
 echo "BASE IMAGES BUILT!"
@@ -77,3 +90,5 @@ echo "Images:"
 for IMAGE in "${BASE_IMAGE}" "${BUILD_IMAGE}" "${RUN_IMAGE}"; do
   echo "    ${IMAGE}"
 done
+
+docker image ls