diff --git a/run-container.sh b/run-container.sh index 3a477f0..a4cd645 100755 --- a/run-container.sh +++ b/run-container.sh @@ -14,6 +14,8 @@ function main VASL_BOARDS= CHAPTER_H_NOTES= USER_FILES= + LOGGING_CONFIG= + VASSAL_SHIM_LOGGING_CONFIG= ASA_INDEX= ROAR_INDEX= VO_NOTES_IMAGE_CACHE= @@ -34,7 +36,7 @@ function main print_help exit 0 fi - params="$(getopt -o p:v:e:k:t:d -l port:,control-tests-port:,vassal:,vasl:,vasl-extensions:,boards:,chapter-h:,template-pack:,user-files:,asa-index:,roar-index:,vo-notes-image-cache:,tag:,name:,detach,no-build,build-arg:,build-network:,run-network:,test-data-vassal:,test-data-vasl-mods:,help --name "$0" -- "$@")" + params="$(getopt -o p:v:e:k:t:d -l port:,control-tests-port:,vassal:,vasl:,vasl-extensions:,boards:,chapter-h:,template-pack:,user-files:,logging:,vassal-shim-logging:,asa-index:,roar-index:,vo-notes-image-cache:,tag:,name:,detach,no-build,build-arg:,build-network:,run-network:,test-data-vassal:,test-data-vasl-mods:,help --name "$0" -- "$@")" if [ $? -ne 0 ]; then exit 1; fi eval set -- "$params" while true; do @@ -63,6 +65,12 @@ function main -k | --template-pack) TEMPLATE_PACK=$2 shift 2 ;; + --logging) + LOGGING_CONFIG=$2 + shift 2 ;; + --vassal-shim-logging) + VASSAL_SHIM_LOGGING_CONFIG=$2 + shift 2 ;; --asa-index) ASA_INDEX=$2 shift 2 ;; @@ -198,7 +206,27 @@ function main fi mpoint=/data/template-pack TEMPLATE_PACK_VOLUME="--volume $target:$mpoint" - TEMPLATE_PACK_ENV="--env DEFAULT_TEMPLATE_PACK=$mpoint --env DEFAULT_TEMPLATE_PACK_TARGET=$target" + TEMPLATE_PACK_ENV="--env DEFAULT_TEMPLATE_PACK=$mpoint" + fi + + # check if logging has been configured + if [ -n "$LOGGING_CONFIG" ]; then + target=$( get_target FILE "$LOGGING_CONFIG" ) + if [ -z "$target" ]; then + echo "Can't find the logging config file: $LOGGING_CONFIG" + exit 1 + fi + mpoint=/app/vasl_templates/webapp/config/logging.yaml + LOGGING_CONFIG_VOLUME="--volume $target:$mpoint" + fi + if [ -n "$VASSAL_SHIM_LOGGING_CONFIG" ]; then + target=$( get_target FILE "$VASSAL_SHIM_LOGGING_CONFIG" ) + if [ -z "$target" ]; then + echo "Can't find the VASSAL shim logging config file: $VASSAL_SHIM_LOGGING_CONFIG" + exit 1 + fi + mpoint=/app/vassal-shim/release/logback-test.xml + VASSAL_SHIM_LOGGING_CONFIG_VOLUME="--volume $target:$mpoint" fi # check if external ASA/ROAR index files have been specified @@ -271,6 +299,7 @@ function main --env DOCKER_CONTAINER_NAME="$CONTAINER_NAME" \ $CONTROL_TESTS_PORT_RUN \ $VASSAL_VOLUME $VASL_MOD_VOLUME $VASL_EXTNS_VOLUME $VASL_BOARDS_VOLUME $CHAPTER_H_NOTES_VOLUME $TEMPLATE_PACK_VOLUME $USER_FILES_VOLUME \ + $LOGGING_CONFIG_VOLUME $VASSAL_SHIM_LOGGING_CONFIG_VOLUME \ $ASA_INDEX_VOLUME $ROAR_INDEX_VOLUME $VO_NOTES_IMAGE_CACHE_VOLUME \ $VASSAL_ENV $VASL_MOD_ENV $VASL_EXTNS_ENV $VASL_BOARDS_ENV $CHAPTER_H_NOTES_ENV $TEMPLATE_PACK_ENV $USER_FILES_ENV \ $RUN_NETWORK $DETACH \