Skip to content

Commit

Permalink
Updated local dev scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiaswking committed Feb 20, 2019
1 parent fd7f09b commit d078ca8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion server/scripts/local_server_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions server/scripts/run.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions server/scripts/run_dev.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions server/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

---

Expand Down

0 comments on commit d078ca8

Please sign in to comment.