diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-02-22 01:18:51 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-02-22 01:24:27 -0600 |
| commit | f54a4aad8cdff00f2bbac984b1e98fb1add038be (patch) | |
| tree | 2cfb8efaaf083441e67369b0461c9cf2956aff52 /auth/docker | |
| parent | 8da0163b75076832417ee9b255f63b4c789e3c12 (diff) | |
Refine Local Agent.sh use
Issue-ID: AAF-770
Change-Id: Ic6593bde1e16db35cf538cb1d2caa152016f3a82
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile.base | 2 | ||||
| -rw-r--r-- | auth/docker/agent.sh | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base index af29b951..69627945 100644 --- a/auth/docker/Dockerfile.base +++ b/auth/docker/Dockerfile.base @@ -17,7 +17,9 @@ # limitations under the License. # ============LICENSE_END==================================================== # +# Use Public Image FROM nexus3.onap.org:10001/openjdk:8-jre-alpine +#FROM openjdk:8-jre-alpine MAINTAINER AAF Team, AT&T 2018 LABEL description="aaf_base" diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index 7e7d08c0..4be485b8 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -127,13 +127,13 @@ function run_it() { function sso { if [ -n "$2" ]; then - echo "$1=$2" >> ~/.aaf/sso.props + echo "$1=$2" >> $HOME/.aaf/sso.props fi } function reset_sso { mkdir -p ~/.aaf - > ~/.aaf/sso.props + > $HOME/.aaf/sso.props sso aaf_locate_url "https://$AAF_FQDN:8095" sso cadi_latitude "$LATITUDE" sso cadi_longitude "$LONGITUDE" @@ -160,9 +160,9 @@ case "$1" in shift reset_sso if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then - java -Dcadi_prop_files="~\/.aaf\/sso.props" -jar aaf-auth-cmd-$VERSION*-full.jar $@ + java -Dcadi_prop_files="$HOME/.aaf/sso.props" -jar aaf-auth-cmd-$VERSION*-full.jar $@ else - echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION*-full.jar' (or newer)" + echo "For local use, you need to have 'aaf-auth-cmd-$VERSION*-full.jar' (or newer)" fi ;; local) @@ -186,8 +186,7 @@ case "$1" in sso aaf_id "$DEPLOY_FQI" sso aaf_password "$DEPLOY_PASSWORD" if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then - mkdir -p $APP_FQDN - java -Dcadi_prop_files="~\/.aaf\/sso.props" -cp aaf-auth-cmd-$VERSION*-full.jar org.onap.aaf.cadi.configure.Agent $CMD + java -Dcadi_prop_files="$HOME/.aaf/sso.props" -cp aaf-auth-cmd-$VERSION*-full.jar org.onap.aaf.cadi.configure.Agent $CMD else echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION*-full.jar' (or newer)" fi |