From 75ef30d21be3d01bcd2e26a924d70bb0ec9ce38b Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Tue, 11 Jun 2019 14:01:35 -0400 Subject: [PATCH] Always consider devel tag as a cache source When you do `make docker-compose-build` on your branch without any changes, this will use the devel tag as a cache source. This will speed things up if you havent made any local changes to the Makefile or requirements files. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 42683032f1..a6b3c3cec6 100644 --- a/Makefile +++ b/Makefile @@ -587,7 +587,9 @@ docker-compose-build: awx-devel-build # Base development image build awx-devel-build: - docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) . + docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile \ + --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:devel \ + --cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) . docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)