Merge branch 'master' of bitbucket.org:blankoworld/eost_gissmo_tools
This commit is contained in:
commit
2f38dd78e1
@ -190,7 +190,7 @@ dev() {
|
||||
if [ $GISSMO_DEV_RUNNING_PORT -eq 0 ]; then
|
||||
PORT_PARAM=" -P "
|
||||
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() {
|
||||
@ -322,7 +322,7 @@ start() {
|
||||
# Run existing Docker container, otherwise create a new one
|
||||
GISSMO_RUNNING=$($docker_cmd inspect --format="{{ .State.Running }}" ${GISSMO_DOCKER_NAME} 2> /dev/null)
|
||||
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
|
||||
error_and_quit "${GISSMO_DOCKER_NAME} is already launched! If you need
|
||||
another name please set GISSMO_DOCKER_NAME in configuration file."
|
||||
|
Loading…
Reference in New Issue
Block a user