summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAlan Rominger <arominge@redhat.com>2023-03-30 19:46:15 +0200
committerAlan Rominger <arominge@redhat.com>2023-03-30 19:46:15 +0200
commit7bb0d32be17b36a00674a55dd239eaa8baeaf591 (patch)
treec836bac7b51a6c2a0752c56eb49d92e26b7c0514 /Makefile
parentMerge pull request #13423 from ansible/feature_web-task-split (diff)
downloadawx-7bb0d32be17b36a00674a55dd239eaa8baeaf591.tar.xz
awx-7bb0d32be17b36a00674a55dd239eaa8baeaf591.zip
Fix docker-clean file, accounting for slashes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d81266352f..9afc7c7440 100644
--- a/Makefile
+++ b/Makefile
@@ -561,7 +561,7 @@ 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);)
- -$(foreach image_id,$(shell docker images --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);)
+ -$(foreach image_id,$(shell docker images --filter=reference='*/*/*awx_devel*' --filter=reference='*/*awx_devel*' --filter=reference='*awx_devel*' -aq),docker rmi --force $(image_id);)
docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean
docker volume rm -f tools_awx_db tools_grafana_storage tools_prometheus_storage $(docker volume ls --filter name=tools_redis_socket_ -q)
@@ -680,4 +680,3 @@ help/generate:
## Display help for ui-next targets
help/ui-next:
@make -s help MAKEFILE_LIST="awx/ui_next/Makefile"
-