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

Merge pull request #6601 from shanemcd/dont-delete-my-db

Browse Source 
Use a docker volume for the dev env db

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-07 20:00:57 +00:00
committed by GitHub
parent 7de8a8700c 7e52f4682c
commit 054de87f8e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -668,11 +668,12 @@ docker-compose-isolated-build: awx-devel-build
docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) docker tag ansible/awx_isolated $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
#docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG) #docker push $(DEV_DOCKER_TAG_BASE)/awx_isolated:$(COMPOSE_TAG)
MACHINE?=default
docker-clean: docker-clean:
eval $$(docker-machine env $(MACHINE))
$(foreach container_id,$(shell docker ps -f name=tools_awx -aq),docker stop $(container_id); docker rm -f $(container_id);) $(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 images | grep "awx_devel" | awk '{print $$1 ":" $$2}' | xargs docker rmi
docker-clean-volumes:
docker volume rm tools_awx_db
docker-refresh: docker-clean docker-compose docker-refresh: docker-clean docker-compose

5
tools/docker-compose.yml
View File

@@ -50,6 +50,8 @@ services:
- "5432:5432" - "5432:5432"
environment: environment:
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- "awx_db:/var/lib/postgresql/data"
memcached: memcached:
user: ${CURRENT_UID} user: ${CURRENT_UID}
image: memcached:alpine image: memcached:alpine
@@ -67,3 +69,6 @@ services:
- "./redis/redis.conf:/usr/local/etc/redis/redis.conf" - "./redis/redis.conf:/usr/local/etc/redis/redis.conf"
- "./redis/redis_socket_standalone:/var/run/redis/" - "./redis/redis_socket_standalone:/var/run/redis/"
command: ["/usr/local/etc/redis/redis.conf"] command: ["/usr/local/etc/redis/redis.conf"]
volumes:
awx_db: