External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove --squash option from awx-devel-build

Browse Source 
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.
This commit is contained in:
Shane McDonald
2019-05-08 22:22:38 -04:00
parent 83c286580b
commit 22858f0044
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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)