diff --git a/config.sh b/config.sh index 82685b2954eb7b06d58c304e197cea0ac18ea6bc..b811d560fba6503041727e4d9d32ae9ef374fe71 100755 --- a/config.sh +++ b/config.sh @@ -44,7 +44,7 @@ NOVNC_DIR=novnc NOVNC_URL="$GIT_URL$NOVNC_DIR".git if [ "$USE_NOVNC" == "true" ]; then novnc_compose_file=" -f novnc/docker-compose.yml " -DOCKER_COMPOSE_FILES+=$"$novnc_compose_file" +DOCKER_COMPOSE_FILES+="$novnc_compose_file" fi # Mumble @@ -52,6 +52,6 @@ MUMBLE_DIR=build-mumble-web MUMBLE_URL=https://github.com/Johni0702/mumble-web.git if [ "$USE_MUMBLE" == "true" ]; then mumble_compose_file=" -f build-mumble-web/docker-compose.production.yml" -DOCKER_COMPOSE_FILES+=$"$mumble_compose_file" +DOCKER_COMPOSE_FILES+="$mumble_compose_file" SUB_DOMAINS+="mumble-web" fi diff --git a/tools/update_containers.sh b/tools/update_containers.sh index 06743825b9f2e2d4a6c8278d83483218777440a7..24d74507da09d7bd906b4fd96c38e385639931e7 100755 --- a/tools/update_containers.sh +++ b/tools/update_containers.sh @@ -15,10 +15,10 @@ echo "" # Build new images if neccessary if [ "$USE_MUMBLE" == "true" ]; then - docker-compose -f "$mumble_compose_file" build + docker-compose "$mumble_compose_file" build fi if [ "$USE_NOVNC" == "true" ]; then - docker-compose -f "$novnc_compose_file" build + docker-compose "$novnc_compose_file" build fi