From b97bcab2f675b4e887c06d56a964dfcd97d238bb Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 26 Sep 2014 11:09:41 -0400 Subject: [PATCH] control updates for docker --- .docker/control.sh | 24 ++++++++++++++++++++++++ .docker/start.sh | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.docker/control.sh b/.docker/control.sh index 355913b..130d62a 100755 --- a/.docker/control.sh +++ b/.docker/control.sh @@ -1,6 +1,20 @@ #!/bin/bash ACTION=$1 +function stop_stack() { + docker stop snipt-proxy > /dev/null + docker stop snipt-app > /dev/null + docker stop snipt-es > /dev/null + docker stop snipt-pg > /dev/null +} + +function start_stack() { + docker start snipt-pg > /dev/null + docker start snipt-es > /dev/null + docker start snipt-app > /dev/null + docker start snipt-proxy > /dev/null +} + if [ "$ACTION" = "syncdb" ]; then docker run -it --rm -e DB_USER=postgres -e DB_NAME=postgres --net container:snipt-net snipt/snipt python manage.py syncdb --noinput fi @@ -31,7 +45,17 @@ if [ "$ACTION" = "restart" ]; then docker restart snipt-app fi +if [ "$ACTION" = "restart-stack" ]; then + echo "restarting stack" + stop_stack + start_stack +fi + if [ "$ACTION" = "backupdb" ]; then echo "backing up db" docker run --rm --net container:snipt-net --entrypoint pg_dump postgres:9.1 -h 127.0.0.1 -U postgres snipt fi + +if [ "$ACTION" = "psql" ]; then + docker run it --rm --net container:snipt-net --entrypoint psql postgres:9.1 -h 127.0.0.1 -U postgres snipt +fi diff --git a/.docker/start.sh b/.docker/start.sh index 2a2f0be..6a1b25e 100755 --- a/.docker/start.sh +++ b/.docker/start.sh @@ -34,7 +34,7 @@ for CMP in $COMPONENTS; do # collect static docker run -it --rm -v $(pwd)/static:/app/snipt/static --net container:snipt-net snipt/snipt python manage.py collectstatic --noinput # run app - docker run -it --name snipt-app -d -e DB_USER=postgres -e DB_NAME=snipt -e DEBUG=false -v /etc/settings_local.py:/app/snipt/settings_local.py --net container:snipt-net snipt/snipt > /dev/null + docker run -it --name snipt-app -d -e DB_PORT_5432_TCP_ADDR=127.0.0.1 -e DB_PORT_5432_TCP_PORT=5432 -e DB_USER=postgres -e DB_NAME=snipt -e DEBUG=false -v /etc/settings_local.py:/app/snipt/settings_local.py --net container:snipt-net snipt/snipt > /dev/null sleep 1 fi