Skip to content

Commit

Permalink
Auto merge of #995 - schisamo:schisamo/fix-artifactory-run, r=smith
Browse files Browse the repository at this point in the history
Use best practices in artifactory-pro run hook

These updates are based on feedback from @jamesc in #989.

Signed-off-by: Seth Chisamore <[email protected]>

/cc @smith
  • Loading branch information
thesentinels committed Jun 27, 2016
2 parents 42c037b + bb3152b commit 53eaf2b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion plans/artifactory-pro/hooks/run
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/sh

exec 2>&1

echo "Starting Artifactory Pro"

export JAVA_HOME=$(hab pkg path core/server-jre)
export ARTIFACTORY_HOME={{pkg.svc_var_path}}

{{pkg.svc_var_path}}/bin/artifactory.sh 2>&1
exec {{pkg.svc_var_path}}/bin/artifactory.sh

0 comments on commit 53eaf2b

Please sign in to comment.