diff options
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile.base | 2 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.client | 1 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.config | 1 | ||||
| -rw-r--r-- | auth/docker/agent.sh | 12 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 2 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 15 |
6 files changed, 16 insertions, 17 deletions
diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base index ad8e271c..35ade62b 100644 --- a/auth/docker/Dockerfile.base +++ b/auth/docker/Dockerfile.base @@ -18,7 +18,7 @@ # ============LICENSE_END==================================================== # # Use dbuild.sh input parameter to set registry -FROM ${REGISTRY}openjdk:8-jre-alpine +FROM ${REGISTRY}/openjdk:8-jre-alpine MAINTAINER AAF Team, AT&T 2018 LABEL description="aaf_base" diff --git a/auth/docker/Dockerfile.client b/auth/docker/Dockerfile.client index 111c3774..b62f7b4f 100644 --- a/auth/docker/Dockerfile.client +++ b/auth/docker/Dockerfile.client @@ -18,7 +18,6 @@ # ============LICENSE_END==================================================== # FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_base:${AAF_VERSION} -#FROM nexus3.onap.org:10001/onap/aaf/aaf-base-xenial:latest MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config index 7e442b2a..27b2ffff 100644 --- a/auth/docker/Dockerfile.config +++ b/auth/docker/Dockerfile.config @@ -18,7 +18,6 @@ # ============LICENSE_END==================================================== # FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_base:${AAF_VERSION} -#FROM nexus3.onap.org:10001/onap/aaf/aaf-base-xenial:latest MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index ce878f58..931249b0 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -159,10 +159,10 @@ case "$1" in aafcli) shift reset_sso - if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then - java -Dcadi_prop_files="$HOME/.aaf/sso.props" -jar aaf-auth-cmd-$VERSION*-full.jar $@ + if [ -f aaf-cadi-aaf-$VERSION-full.jar ]; then + java -Dcadi_prop_files="$HOME/.aaf/sso.props" -jar aaf-cadi-aaf-$VERSION-full.jar $@ else - echo "For local use, you need to have 'aaf-auth-cmd-$VERSION*-full.jar' (or newer)" + echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION-full.jar' (or newer)" fi ;; local) @@ -185,10 +185,10 @@ case "$1" in reset_sso sso aaf_id "$DEPLOY_FQI" sso aaf_password "$DEPLOY_PASSWORD" - if [ -f aaf-auth-cmd-$VERSION*-full.jar ]; then - java -Dcadi_prop_files="$HOME/.aaf/sso.props" -cp aaf-auth-cmd-$VERSION*-full.jar org.onap.aaf.cadi.configure.Agent $CMD + if [ -f aaf-cadi-aaf-$VERSION-full.jar ]; then + java -Dcadi_prop_files="$HOME/.aaf/sso.props" -cp aaf-cadi-aaf-$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)" + echo "For local use, you need to have 'aaf-cadi-aaf-$VERSION-full.jar' (or newer)" fi ;; *) diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 54a3926d..b9eb0162 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -20,6 +20,8 @@ # Variables for building Docker entities ORG=onap PROJECT=aaf +# Note: Override can happen on dbuild.sh Commandline, -r <registry> +DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 VERSION=2.1.11-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index cdd97fc7..b2a5d510 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -21,7 +21,13 @@ # Docker Building Script. Reads all the components generated by install, on per-version basis # -DOCKER_PULL_REGISTRY='nexus3.onap.org:10001\/' +# Pull in Variables from d.props +if [ ! -e ./d.props ]; then + cp d.props.init d.props +fi + +. ./d.props + AAF_COMPONENTS=ALL # process input. originally, an optional positional parameter is used to designate a component. @@ -45,13 +51,6 @@ fi echo "$0: AAF_COMPONENTS=$AAF_COMPONENTS DOCKER_PULL_REGISTRY=$DOCKER_PULL_REGISTRY" -# Pull in Variables from d.props -if [ ! -e ./d.props ]; then - cp d.props.init d.props -fi - -. ./d.props - DOCKER=${DOCKER:=docker} echo "Building Containers for aaf components, version $VERSION" |