diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-10-01 15:26:03 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-10-01 15:26:06 -0500 |
| commit | 365638c2c53d3b790b6914fe3e06b58cec3b2963 (patch) | |
| tree | b8ca6505a97a67ce30d62ecefb2c4c5dca968ebe /auth/docker | |
| parent | df3aa01e9fdc365770cf11e4c6d92b2d49122810 (diff) | |
Adjust Client Container
Change Client Container to reflect changes in regular Containers.
Issue-ID: AAF-517
Change-Id: I26a6e657b2a626a2a5cd7c22fff5217b6fb8ed71
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile.client | 2 | ||||
| -rw-r--r-- | auth/docker/agent.sh | 10 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/auth/docker/Dockerfile.client b/auth/docker/Dockerfile.client index aed42212..2ecf6a5d 100644 --- a/auth/docker/Dockerfile.client +++ b/auth/docker/Dockerfile.client @@ -8,7 +8,7 @@ LABEL version=${AAF_VERSION} COPY logs /opt/app/aaf_config/logs COPY bin/client.sh /opt/app/aaf_config/bin/agent.sh COPY bin/aaf-cadi*full.jar /opt/app/aaf_config/bin/ -COPY public/*all.jks /opt/app/aaf_config/public/ +COPY cert/*trust*.b64 /opt/app/aaf_config/cert/ ENTRYPOINT ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"] CMD [] diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index 1ca12eb8..38b1070d 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -16,7 +16,7 @@ for V in VERSION DOCKER_REPOSITORY AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_ case $V in DOCKER_REPOSITORY) PROMPT="Docker Repo" - DEF=nexus3.onap.org:10003 + DEF="" ;; AAF_FQDN) PROMPT="AAF's FQDN";; DEPLOY_FQI) PROMPT="Deployer's FQI";; @@ -58,6 +58,12 @@ if [ "$(docker volume ls | grep ${VOLUME})" = "" ]; then docker volume create -d ${DRIVER} ${VOLUME} fi +if [ -n "$DOCKER_REPOSITORY" ]; then + PREFIX="$DOCKER_REPOSITORY/" +else + PREFIX="" +fi + docker run \ -it \ --rm \ @@ -71,5 +77,5 @@ docker run \ --env LATITUDE=${LATITUDE} \ --env LONGITUDE=${LONGITUDE} \ --name aaf_agent_$USER \ - $DOCKER_REPOSITORY/onap/aaf/aaf_agent:$VERSION \ + "$PREFIX"onap/aaf/aaf_agent:$VERSION \ /bin/bash "$@" diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 886e7e7a..94fc7f46 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -35,6 +35,7 @@ docker tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${ rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar rm -Rf sample/CA cd - + ######## # Second, build a core Docker Image echo Building aaf_$AAF_COMPONENT... |