diff --git a/server/scripts/local_server_run.sh b/server/scripts/local_server_run.sh index 7b4a299f..06e0ab37 100755 --- a/server/scripts/local_server_run.sh +++ b/server/scripts/local_server_run.sh @@ -8,4 +8,4 @@ if [ "$PLATFORMSDK_DIR" == "" ]; then echo "Found platformsdk:" $PLATFORMSDK_DIR fi -PLATFORMSDK_DIR=${PLATFORMSDK_DIR} PATH=${PLATFORMSDK_DIR}/XcodeDefault10.1.xctoolchain/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin java -jar -Dspring.profiles.active=standalone-dev $PWD/server/build/docker/extender-0.1.0.jar +PLATFORMSDK_DIR=${PLATFORMSDK_DIR} PATH=${PLATFORMSDK_DIR}/XcodeDefault10.1.xctoolchain/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin java -jar -Dspring.profiles.active=standalone,standalone-dev $PWD/server/build/docker/extender-0.1.0.jar diff --git a/server/scripts/run.sh b/server/scripts/run.sh index b6746cf6..7625f143 100755 --- a/server/scripts/run.sh +++ b/server/scripts/run.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z "$DYNAMO_HOME" ]; then - docker run --rm --name extender -p 9000:9000 extender/extender; + docker run --rm --name extender -p 9000:9000 $DOCKER_ARGS extender/extender; else - docker run --rm --name extender -p 9000:9000 -v ${DYNAMO_HOME}:/dynamo_home -e DYNAMO_HOME=/dynamo_home extender/extender; + docker run --rm --name extender -p 9000:9000 -v ${DYNAMO_HOME}:/dynamo_home -e DYNAMO_HOME=/dynamo_home $DOCKER_ARGS extender/extender; fi diff --git a/server/scripts/run_dev.sh b/server/scripts/run_dev.sh new file mode 100755 index 00000000..daa64dbd --- /dev/null +++ b/server/scripts/run_dev.sh @@ -0,0 +1,5 @@ +#! /usr/bin/env bash + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +DOCKER_ARGS="-e SPRING_PROFILES_ACTIVE=dev-remote-builder" $SCRIPT_DIR/run.sh diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 13d7dd04..78ba3120 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -121,15 +121,16 @@ extender: --- spring.profiles: standalone-dev -spring.profiles.include: - - standalone - server: port: 9010 extender: sdk-location: ./extender/sdk build-location: ./extender/builds + cache: + enabled: false + remote-builder: + enabled: false ---