Merge pull request #139 from ehazlett/snipt-deploy

snipt deploy
master
Nick Sergeant 2014-09-26 02:21:01 -04:00
commit b64e48521c
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@ if [ "$ACTION" = "deploy" ]; then
docker kill snipt-app
docker rm snipt-app
echo "deploying new container"
docker run -it --name snipt-app -d -e DB_USER=postgres -e DB_NAME=postgres -e DEBUG=false --net container:snipt-net snipt/snipt
docker run -it --name snipt-app -d -e DB_USER=postgres -e DB_NAME=postgres -e DEBUG=false -v /etc/settings_local.py:/app/snipt/settings_local.py --net container:snipt-net snipt/snipt
docker restart snipt-proxy
echo "done"
fi

View File

@ -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 --net container:snipt-net snipt/snipt > /dev/null
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
sleep 1
fi