fix: move the caching to a script

Author: parker-snyk

.circleci/cache-python-docker.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+set -e
+
+# Because the Python image is >3GB the reason the pipeline takes
+# so damn long is because it's downloading the image every time.
+# The download takes longer than the actual tests.
+#
+# This script is used to cache the image and load it from cache
+# when the pipeline runs.
+#
+# The image is saved as a tar file and loaded from cache.
+# The image is pulled from the registry if it's not already present.
+#
+# It will save on time. It will save on bandwidth and CircleCI credits.
+# It will save my sanity.
+#
+# Usage: ./docker-cache.sh [load|save|pull]
+
+CACHE_DIR="/c/docker-cache"
+# This is the image we're caching, Python 3.9. Use the same sha as in test/windows/plugin.spec.ts
+PYTHON_IMAGE="python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6"
+PYTHON_IMAGE_FILE="python-3.9.0.tar"
+
+case "$1" in
+  load)
+    echo "=== Loading Docker images from cache ==="
+    if [ -d "$CACHE_DIR" ] && [ "$(ls -A $CACHE_DIR/*.tar 2>/dev/null)" ]; then
+      for image in $CACHE_DIR/*.tar; do
+        echo "Loading $(basename $image)..."
+        docker load -i "$image"
+      done
+      echo "Docker images loaded from cache successfully"
+    else
+      echo "No cached Docker images found in $CACHE_DIR"
+    fi
+    ;;
+    
+  pull)
+    echo "=== Pre-pulling Python test image ==="
+    echo "Checking if Python image exists locally..."
+    if ! docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
+      echo "Python image not found locally, pulling from registry..."
+      docker pull "$PYTHON_IMAGE"
+      echo "Python image pulled successfully"
+    else
+      echo "Python image already exists locally"
+    fi
+    ;;
+    
+  save)
+    echo "=== Saving Docker images to cache ==="
+    mkdir -p "$CACHE_DIR"
+    
+    # Save the Python test image
+    if docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
+      echo "Saving Python image to cache..."
+      docker save "$PYTHON_IMAGE" -o "$CACHE_DIR/$PYTHON_IMAGE_FILE"
+      echo "Python image saved to $CACHE_DIR/$PYTHON_IMAGE_FILE"
+    else
+      echo "Python image not found locally, skipping save"
+    fi
+    
+    # List cached files
+    if [ -d "$CACHE_DIR" ] && [ "$(ls -A $CACHE_DIR/*.tar 2>/dev/null)" ]; then
+      echo "Cached Docker images:"
+      ls -lh $CACHE_DIR/*.tar
+    fi
+    ;;
+    
+  *)
+    echo "Usage: $0 [load|save|pull]"
+    echo "  load - Load Docker images from cache"
+    echo "  save - Save Docker images to cache" 
+    echo "  pull - Pull Python image if not already present"
+    exit 1
+    ;;
+esac

.circleci/config.yml

@@ -212,28 +212,12 @@ jobs:
 
       - run:
           name: Load cached Docker images if available
-          command: |
-            if [ -d "/c/docker-cache" ] && [ "$(ls -A /c/docker-cache/*.tar 2>/dev/null)" ]; then
-              for image in /c/docker-cache/*.tar; do
-                echo "Loading $(basename $image)..."
-                docker load -i "$image"
-              done
-            else
-              echo "No cached Docker images found"
-            fi
+          command: .circleci/cache-python-docker.sh load
 
       # Pre-pull the Python image to cache it
       - run:
           name: Pre-pull Python test image
-          command: |
-            PYTHON_IMAGE="python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6"
-            echo "Checking if Python image exists locally..."
-            if ! docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
-              echo "Pulling Python image for cache..."
-              docker pull "$PYTHON_IMAGE"
-            else
-              echo "Python image already exists locally"
-            fi
+          command: .circleci/cache-python-docker.sh pull
       - run:
           name: Install JUnit coverage reporter
           command: npm install --no-save jest-junit
@@ -252,14 +236,7 @@ jobs:
       - run:
           name: Save Docker images to cache
           when: always
-          command: |
-            mkdir -p /c/docker-cache
-            # Save the Python test image
-            PYTHON_IMAGE="python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6"
-            if docker images -q "$PYTHON_IMAGE" 2>/dev/null | grep -q .; then
-              echo "Saving Python image to cache..."
-              docker save "$PYTHON_IMAGE" -o "/c/docker-cache/python-3.9.0.tar"
-            fi
+          command: .circleci/cache-python-docker.sh save
 
       - save_cache:
           key: v1-docker-images-{{ checksum "test/windows/plugin.spec.ts" }}