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

[UP] Adapt launcher regarding Gissmo 2.x experimental branch structure

Browse Source
This commit is contained in:
Olivier DOSSMANN 2017-11-22 10:00:25 +01:00
parent fa9ea2fcdb
commit ff93eb34b0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.example
View File

@ -20,5 +20,6 @@ DB_DIR="/dbdata"
GIT_BRANCH="v1.7" GIT_BRANCH="v1.7"
GISSMO_VERSION="1.7" GISSMO_VERSION="1.7"
# GISSMO_DOCKER_NAME="gissmo" # GISSMO_DOCKER_NAME="gissmo"
DJANGO_DIR="django" # only for Gissmo 2.x
GISSMO_DOCKER_PORT="8002" GISSMO_DOCKER_PORT="8002"
UPLOAD_DIR="/srv/upload" UPLOAD_DIR="/srv/upload"

9
launch.sh
View File

@ -47,6 +47,13 @@ fi
GISSMO_DIR="${PROJECT_DIR}/${GIT_DIR_NAME}" GISSMO_DIR="${PROJECT_DIR}/${GIT_DIR_NAME}"
DOCKERFILE="${GISSMO_DIR}/${DOCKERFILE_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 ## Miscellaneous
COMMAND="$1" COMMAND="$1"
shift 1; ARGS="$@" shift 1; ARGS="$@"
@ -185,7 +192,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}:/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() { test_backup() {