From e3ecf445e23c528af76c1a288d39dbca74f45fee Mon Sep 17 00:00:00 2001
From: Scott Leishman <scott.leishman@gmail.com>
Date: Mon, 26 Nov 2018 17:09:02 -0800
Subject: [PATCH] ensure we pull from main coach container layers as cache.
 (#106)

---
 .circleci/config.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b9e0c2..c6220fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,11 +52,17 @@ jobs:
             docker build --cache-from ${REGISTRY}/coach-base:${MASTER_BRANCH} -t ${REGISTRY}/coach-base:${TAG} -f docker/Dockerfile.base .
 
             docker push ${REGISTRY}/coach-base:${TAG}
-
             docker tag ${REGISTRY}/coach-base:${TAG} coach-base:master
 
-            docker build --build-arg MUJOCO_KEY=${MUJOCO_KEY} -t ${REGISTRY}/coach:${TAG} -f docker/Dockerfile .
+            docker pull ${REGISTRY}/coach:${MASTER_BRANCH}
+            docker pull ${REGISTRY}/coach:builder-${MASTER_BRANCH}
+
+            docker build --target builder --cache-from ${REGISTRY}/coach:${MASTER_BRANCH} --cache-from ${REGISTRY}/coach:builder-${MASTER_BRANCH} --build-arg MUJOCO_KEY=${MUJOCO_KEY} -t ${REGISTRY}/coach:builder-${TAG} -f docker/Dockerfile .
+            docker push ${REGISTRY}/coach:builder-${TAG}
+
+            docker build --cache-from ${REGISTRY}/coach:${MASTER_BRANCH} --cache-from ${REGISTRY}/coach:builder-${TAG} --build-arg MUJOCO_KEY=${MUJOCO_KEY} -t ${REGISTRY}/coach:${TAG} -f docker/Dockerfile .
             docker push ${REGISTRY}/coach:${TAG}
+
           no_output_timeout: 30m
 
   build_gym_env:
@@ -318,9 +324,14 @@ jobs:
             docker tag ${REGISTRY}/coach-base:${TAG} ${REGISTRY}/coach-base:${MASTER_BRANCH}
             docker push ${REGISTRY}/coach-base:${MASTER_BRANCH}
 
+            docker pull ${REGISTRY}/coach:builder-${TAG}
+            docker tag ${REGISTRY}/coach:builder-${TAG} ${REGISTRY}/coach:builder-${MASTER_BRANCH}
+            docker push ${REGISTRY}/coach:builder-${MASTER_BRANCH}
+
             docker pull ${REGISTRY}/coach:${TAG}
             docker tag ${REGISTRY}/coach:${TAG} ${REGISTRY}/coach:${MASTER_BRANCH}
             docker push ${REGISTRY}/coach:${MASTER_BRANCH}
+            
 
 workflows:
   version: 2