Skip to content

Commit

Permalink
Merge pull request #13786 from AlanCoding/refresh_refresh_refresh
Browse files Browse the repository at this point in the history
Fix docker-clean target, accounting for slashes
  • Loading branch information
AlanCoding authored Mar 30, 2023
2 parents acb22f0 + 7bb0d32 commit 2db29e5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -680,4 +680,3 @@ help/generate:
## Display help for ui-next targets
help/ui-next:
@make -s help MAKEFILE_LIST="awx/ui_next/Makefile"

0 comments on commit 2db29e5

Please sign in to comment.