cache docker builder

.github/workflows/server.yml

@@ -108,10 +108,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set SANITIZED_DOCKER_PLATFORM
+        run: echo "SANITIZED_DOCKER_PLATFORM=$(echo $DOCKER_PLATFORM | tr / _ )" >> $GITHUB_ENV
+      - name: Set DOCKER_BUILDER_IMAGE
+        run: echo "DOCKER_BUILDER_IMAGE=dhfs_lib_builder-${{matrix.os}}-$SANITIZED_DOCKER_PLATFORM" >> $GITHUB_ENV
+
       - name: Build config
         run: |
           echo DO_LOCAL_BUILD: $DO_LOCAL_BUILD
           echo DOCKER_PLATFORM: $DOCKER_PLATFORM
+          echo SANITIZED_DOCKER_PLATFORM: $SANITIZED_DOCKER_PLATFORM
+          echo DOCKER_BUILDER_IMAGE: $DOCKER_BUILDER_IMAGE
 
       - name: Set up JDK 21
         if: ${{ env.DO_LOCAL_BUILD == 'TRUE' }}
@@ -129,6 +136,19 @@ jobs:
         if: ${{ env.DO_LOCAL_BUILD != 'TRUE' }}
         uses: docker/setup-qemu-action@v3
 
+      - name: Build Docker builder image
+        if: ${{ env.DO_LOCAL_BUILD != 'TRUE' }}
+        uses: docker/build-push-action@v5
+        with:
+          context: ./libdhfs_support/builder
+          file: ./libdhfs_support/builder/Dockerfile
+          push: false
+          platforms: ${{ env.DOCKER_PLATFORM }}
+          tags: ${{ env.DOCKER_BUILDER_IMAGE }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          load: true
+
       - name: Build the library
         run: |
           CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release" libdhfs_support/builder/cross-build.sh both build "$(pwd)/result"
@@ -136,7 +156,7 @@ jobs:
       - name: Upload build
         uses: actions/upload-artifact@v3
         with:
-          name: NativeLib-${{ matrix.os }}-${{ env.DOCKER_PLATFORM }}
+          name: NativeLib-${{ matrix.os }}-${{ env.SANITIZED_DOCKER_PLATFORM }}
           path: result
 
   merge-native-libs:

libdhfs_support/builder/docker-launch.sh

@@ -1,18 +1,21 @@
 #!/usr/bin/env bash
 
+set -exo pipefail
+export SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+cd "$SCRIPT_DIR"
+
 PLATFORM_ARG=""
 if [[ ! -z "${DOCKER_PLATFORM}" ]]; then
   PLATFORM_ARG="--platform $DOCKER_PLATFORM"
 fi
 
-set -euxo pipefail
-export SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
-cd "$SCRIPT_DIR"
-
-DOCKER_IMG_FILE=$(mktemp)
-docker build $PLATFORM_ARG --iidfile "$DOCKER_IMG_FILE" .
+if [[ -z "${DOCKER_BUILDER_IMAGE}" ]]; then
+  DOCKER_IMG_FILE=$(mktemp)
+  docker build $PLATFORM_ARG --iidfile "$DOCKER_IMG_FILE" .
+  DOCKER_BUILDER_IMAGE="$(cat "$DOCKER_IMG_FILE")"
+fi
 
 ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 
-docker run $PLATFORM_ARG --rm -v "$ROOT_DIR:$ROOT_DIR" -e DO_LOCAL_BUILD=TRUE "$(cat "$DOCKER_IMG_FILE")" \
+docker run $PLATFORM_ARG --rm -v "$ROOT_DIR:$ROOT_DIR" -e DO_LOCAL_BUILD=TRUE "$DOCKER_BUILDER_IMAGE" \
   "$SCRIPT_DIR/cross-build.sh" "$@"