olivier/eost_gissmo_tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of bitbucket.org:blankoworld/eost_gissmo_tools

Browse Source
This commit is contained in:
Olivier DOSSMANN 2016-05-11 18:22:44 +02:00
commit 2f38dd78e1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launch.sh
View File

@ -190,7 +190,7 @@ dev() {
if [ $GISSMO_DEV_RUNNING_PORT -eq 0 ]; then if [ $GISSMO_DEV_RUNNING_PORT -eq 0 ]; then
PORT_PARAM=" -P " PORT_PARAM=" -P "
fi fi
$docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db ${PORT_PARAM} -v ${GISSMO_DIR}:/opt/gissmo -v ${UPLOAD_DIR}:/opt/gissmo/upload gissmo:${GISSMO_VERSION} ${ARGS:='development'} || error_and_quit "Failed to create and launch ${GISSMO_DOCKER_NAME} container." $docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db ${PORT_PARAM} -v ${GISSMO_DIR}:/opt/gissmo -v ${UPLOAD_DIR}:/data gissmo:${GISSMO_VERSION} ${ARGS:='development'} || error_and_quit "Failed to create and launch ${GISSMO_DOCKER_NAME} container."
} }
test_backup() { test_backup() {
@ -322,7 +322,7 @@ start() {
# Run existing Docker container, otherwise create a new one # Run existing Docker container, otherwise create a new one
GISSMO_RUNNING=$($docker_cmd inspect --format="{{ .State.Running }}" ${GISSMO_DOCKER_NAME} 2> /dev/null) GISSMO_RUNNING=$($docker_cmd inspect --format="{{ .State.Running }}" ${GISSMO_DOCKER_NAME} 2> /dev/null)
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
$docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db -p ${GISSMO_DOCKER_PORT}:8000 -e SECRET_KEY="abcdefg" --name ${GISSMO_DOCKER_NAME} -v ${UPLOAD_DIR}:/opt/gissmo/upload gissmo:${GISSMO_VERSION} $ARGS || error_and_quit "Failed to create and launch ${GISSMO_DOCKER_NAME} container." $docker_cmd run -it --rm --link ${POSTGRES_DOCKER_NAME}:db -p ${GISSMO_DOCKER_PORT}:8000 -e SECRET_KEY="abcdefg" --name ${GISSMO_DOCKER_NAME} -v ${UPLOAD_DIR}:/data gissmo:${GISSMO_VERSION} $ARGS || error_and_quit "Failed to create and launch ${GISSMO_DOCKER_NAME} container."
else else
error_and_quit "${GISSMO_DOCKER_NAME} is already launched! If you need error_and_quit "${GISSMO_DOCKER_NAME} is already launched! If you need
another name please set GISSMO_DOCKER_NAME in configuration file." another name please set GISSMO_DOCKER_NAME in configuration file."