Fix Makefile conditional used for docker-refresh (#11238)

This commit is contained in:
Alan Rominger 2021-10-12 13:52:52 -04:00 committed by GitHub
parent cdf7fd64b2
commit 74af187568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -493,8 +493,8 @@ docker-compose-build:
docker-clean:
$(foreach container_id,$(shell docker ps -f name=tools_awx -aq && docker ps -f name=tools_receptor -aq),docker stop $(container_id); docker rm -f $(container_id);)
if [ $(shell docker images | grep "awx_devel") ]; then \
docker images | grep "awx_devel" | awk '{print $$3}' | xargs docker rmi --force; \
if [ "$(shell docker images | grep awx_devel)" ]; then \
docker images | grep awx_devel | awk '{print $$3}' | xargs docker rmi --force; \
fi
docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean