Skip to content

Commit

Permalink
Expose the PIPELINE2_HOST as an env variable
Browse files Browse the repository at this point in the history
so that it can be set at run time for example when starting a Docker
image and remove it from the system.properties (otherwise setting it
as an option when starting the JVM seems to have no effect)
  • Loading branch information
egli authored and bertfrees committed Oct 9, 2017
1 parent 387ca2c commit f23c1d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/main/resources/bin/pipeline2
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,9 @@ run() {
if [ "x$PIPELINE2_AUTH_CLIENTSECRET" != "x" ]; then
OPTS="$OPTS -Dorg.daisy.pipeline.ws.authentication.secret=$PIPELINE2_AUTH_CLIENTSECRET"
fi
if [ "x$PIPELINE2_HOST" != "x" ]; then
OPTS="$OPTS -Dorg.daisy.pipeline.ws.host=$PIPELINE2_HOST"
fi
MAIN=org.apache.felix.main.Main
MODE=" -Dorg.daisy.pipeline.main.mode=webservice"

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/etc/system.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ org.daisy.pipeline.xproc.configuration=${org.daisy.pipeline.home}/etc/config-cal
java.awt.headless=true

#WS configuration
org.daisy.pipeline.ws.host=localhost
#org.daisy.pipeline.ws.host=localhost
#allow local filesystem interaction
#org.daisy.pipeline.ws.localfs=true
#org.daisy.pipeline.ws.authentication=false
Expand Down

0 comments on commit f23c1d6

Please sign in to comment.