From 361ffb5e5438dc76c847c2042cf99923ef599aff Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Wed, 15 Nov 2023 17:48:43 -0800
Subject: [PATCH] CI: separate image for docker cache (#30413)

just registry cache
---
 selfdrive/test/docker_build.sh  | 10 +++++++++-
 selfdrive/test/docker_common.sh |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/selfdrive/test/docker_build.sh b/selfdrive/test/docker_build.sh
index e0ba54f058..d5a05fecad 100755
--- a/selfdrive/test/docker_build.sh
+++ b/selfdrive/test/docker_build.sh
@@ -17,7 +17,15 @@ fi
 
 source $SCRIPT_DIR/docker_common.sh $1 "$TAG_SUFFIX"
 
-DOCKER_BUILDKIT=1 docker buildx build --platform $PLATFORM --load --cache-to type=inline --cache-from type=registry,ref=$REMOTE_TAG -t $REMOTE_TAG -t $LOCAL_TAG -f $OPENPILOT_DIR/$DOCKER_FILE $OPENPILOT_DIR
+if [ -n "$PUSH_IMAGE" ]; then
+  REG_CACHE="--cache-to type=registry,ref=$REMOTE_CACHE_TAG,mode=max"
+fi
+
+DOCKER_BUILDKIT=1 docker buildx build --platform $PLATFORM --load \
+  --cache-from type=registry,ref=$REMOTE_CACHE_TAG \
+  --cache-from type=registry,ref=$REMOTE_TAG \
+  $REG_CACHE \
+  -t $REMOTE_TAG -t $LOCAL_TAG -f $OPENPILOT_DIR/$DOCKER_FILE $OPENPILOT_DIR
 
 if [ -n "$PUSH_IMAGE" ]; then
   docker push $REMOTE_TAG
diff --git a/selfdrive/test/docker_common.sh b/selfdrive/test/docker_common.sh
index 92da71ba66..f1422bf643 100644
--- a/selfdrive/test/docker_common.sh
+++ b/selfdrive/test/docker_common.sh
@@ -22,3 +22,4 @@ TAG_SUFFIX=$2
 LOCAL_TAG=$DOCKER_IMAGE$TAG_SUFFIX
 REMOTE_TAG=$DOCKER_REGISTRY/$LOCAL_TAG
 REMOTE_SHA_TAG=$DOCKER_REGISTRY/$LOCAL_TAG:$COMMIT_SHA
+REMOTE_CACHE_TAG=$DOCKER_REGISTRY/$LOCAL_TAG:cache