From 12363ae1753eddf33e00a7d9526daa2896a6bbeb Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 25 Nov 2019 11:32:41 -0500 Subject: [PATCH] Fix Docker build caching The flow will need to be: - Pre-pull image you want to use - Re-tag as image:$(COMPOSE_TAG) - COMPOSE_TAG=mytag make docker-compose-build --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 98caaba7df..03f6f21941 100644 --- a/Makefile +++ b/Makefile @@ -654,7 +654,6 @@ 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: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)