Docker image build caching improvements (#279)

* try to reuse the cache from upstream if possible

Author: bpkroth

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
             "no_proxy": "${localEnv:no_proxy}",
             "--tag": "benchbase-dev:latest"
         },
-        "cacheFrom": "benchbase.azurecr.io/benchbase-dev"
+        "cacheFrom": "benchbase.azurecr.io/benchbase-dev:latest"
     },
     "initializeCommand": [
         ".devcontainer/scripts/initializeCommand"

.github/workflows/maven.yml

@@ -415,6 +415,15 @@ jobs:
           key: setup-java-${{ runner.os }}-docker-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             setup-java-${{ runner.os }}-docker-maven-
+      - name: Pull base image caches for PR builds
+        if: ${{ github.ref != 'refs/heads/main' }}
+        run: |
+          docker pull benchbase.azurecr.io/benchbase-dev:latest || true
+          docker pull benchbase.azurecr.io/benchbase:latest || true
+      - name: Set NO_CACHE env var for main branch builds
+        if: ${{ github.ref == 'refs/heads/main' }}
+        run: |
+          echo "NO_CACHE=true" >> $GITHUB_ENV
       - name: Build benchbase-dev image
         run: |
           ./docker/benchbase/build-dev-image.sh

docker/benchbase/common-env.sh

@@ -83,3 +83,10 @@ if [ "$DOCKER_BUILDKIT" == 1 ]; then
     docker_build_args='--progress=plain'
 fi
 export DOCKER_BUILDKIT
+
+if [ "${NO_CACHE:-false}" == 'true' ]; then
+    docker_build_args+=' --pull --no-cache'
+else
+    upstream_image="benchbase.azurecr.io/$imagename:latest"
+    docker_build_args+=" --cache-from=$upstream_image"
+fi