mirrors/overleaf-toolkit
1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 23:38:06 +02:00
Code Activity

Fix up docker-compose argument handling

Browse source
This commit is contained in:
Shane Kilkelly 2020-06-16 10:00:00 +01:00
parent bc4f5e1614
commit 2332c15657
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/docker-compose
View file

@ -30,18 +30,20 @@ function __main__() {
compose_file_flags+=("-f ./config/docker-compose.mongo.yml")
fi
# TODO: include sibling containers?
# Include docker-compose.override.yml if it is present
if [[ -f './config/docker-compose.override.yml' ]]; then
compose_file_flags+=("-f ./config/docker-compose.override.yml")
fi
# Build up the flags to pass to docker-compose
project_name_flag="-p ${RC_PROJECT_NAME:-overleaf}"
args="$*"
compose_args=" $project_name_flag ${compose_file_flags[*]} $args"
project_name="${RC_PROJECT_NAME:-overleaf}"
if [[ "${RC_DEBUG:-null}" != "null" ]]; then
echo ">>>>COMPOSE-ARGS>>>>"
echo "$compose_args"
echo $project_name
echo ${compose_file_flags[@]}
echo "<<<<<<<<<<<<<<<<<<<<"
fi
@ -54,8 +56,8 @@ function __main__() {
export RC_REDIS_IMAGE
export RC_REDIS_DATA_PATH
# shellcheck disable=SC2086
exec docker-compose $compose_args
# shellcheck disable=SC2068
exec docker-compose -p "$project_name" ${compose_file_flags[@]} "$@"
}
__main__ "$@"