Save images and reload them in the deploy step.

.circleci/config.yml

@@ -8,8 +8,8 @@ workflows:
     - build
     - deploy:
         requires:
-        - build
         - test
+        - build
 
 jobs:
   test:
@@ -24,9 +24,8 @@ jobs:
       - checkout
 
       - run:
-          name: Build Images
+          name: Run Unit Tests
           command: |
-            # skip building the build image again
             touch build-image/.uptodate &&
             make BUILD_IN_CONTAINER=false test
 
@@ -54,10 +53,20 @@ jobs:
       - run:
           name: Build Images
           command: |
-            # skip building the build image again
             touch build-image/.uptodate &&
             make BUILD_IN_CONTAINER=false
 
+      - run:
+          name: Save Images
+          command: |
+            touch build-image/.uptodate &&
+            make BUILD_IN_CONTAINER=false save-images
+
+      - save_cache:
+          key: v1-logish-{{ .Branch }}-{{ .Revision }}
+          paths:
+          - images/
+
   deploy:
     docker:
       - image: gcr.io/metrictank-gcr/logish-build-image:master-017c0b4
@@ -79,6 +88,15 @@ jobs:
             tar -xz -C /tmp -f /tmp/docker-$VER.tgz
             mv /tmp/docker/* /usr/bin
 
+      - restore_cache:
+          key: v1-logish-{{ .Branch }}-{{ .Revision }}
+
+      - run:
+          name: Load Images
+          command: |
+            touch build-image/.uptodate &&
+            make BUILD_IN_CONTAINER=false load-images
+
       - run:
           name: Push Images
           command: |

.gitignore

@@ -10,3 +10,4 @@ cmd/distributor/distributor
 cmd/ingester/ingester
 cmd/querier/querier
 *.output
+images/

Makefile

@@ -125,6 +125,22 @@ shell: build-image/$(UPTODATE)
 
 endif
 
+save-images:
+	@mkdir -p images
+	for image_name in $(IMAGE_NAMES); do \
+		if ! echo $$image_name | grep build; then \
+			docker save $$image_name:$(IMAGE_TAG) -o images/$$(echo $$image_name | tr "/" _):$(IMAGE_TAG); \
+		fi \
+	done
+
+load-images:
+	@mkdir -p images
+	for image_name in $(IMAGE_NAMES); do \
+		if ! echo $$image_name | grep build; then \
+			docker load -i images/$$(echo $$image_name | tr "/" _):$(IMAGE_TAG); \
+		fi \
+	done
+
 push-images:
 	for image_name in $(IMAGE_NAMES); do \
 		if ! echo $$image_name | grep build; then \