[UP] Adapt launcher regarding Gissmo 2.x experimental branch structure
This commit is contained in:
parent
fa9ea2fcdb
commit
ff93eb34b0
@ -20,5 +20,6 @@ DB_DIR="/dbdata"
|
||||
GIT_BRANCH="v1.7"
|
||||
GISSMO_VERSION="1.7"
|
||||
# GISSMO_DOCKER_NAME="gissmo"
|
||||
DJANGO_DIR="django" # only for Gissmo 2.x
|
||||
GISSMO_DOCKER_PORT="8002"
|
||||
UPLOAD_DIR="/srv/upload"
|
||||
|
@ -47,6 +47,13 @@ fi
|
||||
GISSMO_DIR="${PROJECT_DIR}/${GIT_DIR_NAME}"
|
||||
DOCKERFILE="${GISSMO_DIR}/${DOCKERFILE_NAME}"
|
||||
|
||||
# Set DJANGO_VOLUME_DIR
|
||||
if ! test -z "$DJANGO_DIR"; then
|
||||
DJANGO_VOLUME_DIR="${GISSMO_DIR}/$DJANGO_DIR"
|
||||
else
|
||||
DJANGO_VOLUME_DIR="${GISSMO_DIR}"
|
||||
fi
|
||||
|
||||
## Miscellaneous
|
||||
COMMAND="$1"
|
||||
shift 1; ARGS="$@"
|
||||
@ -185,7 +192,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}:/data 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 ${DJANGO_VOLUME_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() {
|
||||
|
Loading…
Reference in New Issue
Block a user