diff options
| author | Shane McDonald <me@shanemcd.com> | 2020-04-21 21:47:59 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2020-04-21 21:47:59 +0200 |
| commit | 5cad0d243a96d70b25d1f4112fa7f910ef83bb93 (patch) | |
| tree | 67a55236dc83dc28ec67e616ea5fa7b830893a24 /Makefile | |
| parent | Merge pull request #6678 from nixocio/ui_issue_5983 (diff) | |
| download | awx-5cad0d243a96d70b25d1f4112fa7f910ef83bb93.tar.xz awx-5cad0d243a96d70b25d1f4112fa7f910ef83bb93.zip | |
Dev env: stop and remove containers before removing volume
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -644,7 +644,6 @@ detect-schema-change: genschema diff -u -b reference-schema.json schema.json docker-compose-clean: awx/projects - cd tools && CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm -w /awx_devel --service-ports awx make clean cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose rm -sf docker-compose-build: awx-devel-build @@ -666,7 +665,7 @@ docker-clean: $(foreach container_id,$(shell docker ps -f name=tools_awx -aq),docker stop $(container_id); docker rm -f $(container_id);) docker images | grep "awx_devel" | awk '{print $$1 ":" $$2}' | xargs docker rmi -docker-clean-volumes: +docker-clean-volumes: docker-compose-clean docker volume rm tools_awx_db docker-refresh: docker-clean docker-compose |