From 22858f0044b0399410365511f9e658ca3b05bcf3 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 8 May 2019 22:22:38 -0400 Subject: [PATCH] Remove --squash option from awx-devel-build This was intended to save us CI time if / when we switch away from static nodes for Zuul. After merging this in I discovered that this option does not work with `docker build --cache-from`, which will be more benefical in terms of speed improvements anyway. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c3b4390d0..faa5fd4613 100644 --- a/Makefile +++ b/Makefile @@ -590,9 +590,7 @@ docker-compose-build: awx-devel-build # Base development image build awx-devel-build: - # To enable the 'experimental' features in Docker: - # https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file - docker build --squash -t ansible/awx_devel -f tools/docker-compose/Dockerfile . + docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile . docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)