diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-03-29 15:42:37 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-03-29 16:53:00 -0500 |
| commit | aae5c072bcb4608ae87c70fd1edf7ac5b1794ccf (patch) | |
| tree | 3607e74c88a9c8f054c5535b25f1781513b3acac /auth/auth-cass | |
| parent | 1ee8f051ba40bf4f3578952ae499dd15549a86a9 (diff) | |
Refine Container Startup
Issue-ID: AAF-773
Change-Id: Ia198a11eceb9bfacafde26cde97d15949a3fe78c
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/cass_init/cmd.sh | 2 | ||||
| -rw-r--r-- | auth/auth-cass/docker/Dockerfile.cass | 2 | ||||
| -rw-r--r-- | auth/auth-cass/docker/dbuild.sh | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index b26536d6..b6650122 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -149,7 +149,7 @@ case "$1" in # Startup like normal echo "Cassandra Startup" - exec /usr/local/bin/docker-entrypoint.sh + exec -c "/usr/local/bin/docker-entrypoint.sh" ;; wait) # Wait for initialization. This can be called from Docker only as a check to make sure it is ready diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass index 52aa49c8..0406411f 100644 --- a/auth/auth-cass/docker/Dockerfile.cass +++ b/auth/auth-cass/docker/Dockerfile.cass @@ -18,7 +18,7 @@ # ============LICENSE_END==================================================== # # Use dbuild.sh input parameter to set registry -FROM ${REGISTRY}cassandra:3.11 +FROM ${REGISTRY}/cassandra:3.11 MAINTAINER AAF Team, AT&T 2018 ENV VERSION=${AAF_VERSION} diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh index 2913b1af..17d359ce 100644 --- a/auth/auth-cass/docker/dbuild.sh +++ b/auth/auth-cass/docker/dbuild.sh @@ -29,10 +29,10 @@ DOCKER=${DOCKER:-docker} echo "$0: Building aaf_cass Container for aaf_cass:$VERSION" # default nexus repo only contains Amd64 images, use docker.io for multi-platform builds -if [[ $1 && $1 == "docker.io" ]]; then - DOCKER_PULL_REGISTRY='' -else - DOCKER_PULL_REGISTRY='nexus3.onap.org:10001\/' +if [ $# -gt 0 ]; then + if [ "$1" == "-r" ]; then + DOCKER_PULL_REGISTRY=$2 + fi fi echo "$0: DOCKER_PULL_REGISTRY=${DOCKER_REGISTRY}" |