diff options
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/.gitignore | 1 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.config | 1 | ||||
| -rw-r--r-- | auth/docker/aaf.props | 15 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 12 | ||||
| -rw-r--r-- | auth/docker/dbounce.sh | 4 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 1 |
6 files changed, 16 insertions, 18 deletions
diff --git a/auth/docker/.gitignore b/auth/docker/.gitignore index a03737d0..c058b043 100644 --- a/auth/docker/.gitignore +++ b/auth/docker/.gitignore @@ -1,2 +1,3 @@ local d.props +aaf.props diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config index f3bd6bc9..60e82ad1 100644 --- a/auth/docker/Dockerfile.config +++ b/auth/docker/Dockerfile.config @@ -11,6 +11,7 @@ COPY local /opt/app/aaf_config/local COPY public /opt/app/aaf_config/public COPY logs /opt/app/aaf_config/logs COPY bin/service.sh /opt/app/aaf_config/bin/agent.sh +COPY bin/aaf-cadi-aaf-${VERSION}-full.jar /opt/app/aaf_config/bin/ ENTRYPOINT ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"] CMD [] diff --git a/auth/docker/aaf.props b/auth/docker/aaf.props index 8d18f55d..5c654806 100644 --- a/auth/docker/aaf.props +++ b/auth/docker/aaf.props @@ -1,14 +1,11 @@ -FQI=clamp@clamp.onap.org -VOLUME=clamp_aaf -LONGITUDE=-92 -FQDN=meriadoc.mithril.sbc.com VERSION=2.1.2-SNAPSHOT -DRIVER=local -LATITUDE=38 -FQDN_IP=192.168.99.100 AAF_FQDN=meriadoc.mithril.sbc.com -AAF_AAF_FQDN_IP=192.168.99.100 DEPLOY_FQI=deployer@people.osaaf.org -DEPLOY_PASSWORD=demo123456! APP_FQDN=meriadoc.mithril.sbc.com APP_FQI=clamp@clamp.onap.org +VOLUME=clamp_aaf +DRIVER=local +LATITUDE=38.432899 +LONGITUDE=-90.43248 +AAF_AAF_FQDN_IP=192.168.99.100 +DEPLOY_PASSWORD=demo123456! diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 8691591c..b0ba63d8 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -6,12 +6,12 @@ VERSION=2.1.2-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # Local Env info -HOSTNAME= +HOSTNAME=aaf.osaaf.org HOST_IP= -CASS_HOST=<cass FQDN>:<cass IP> +CASS_HOST=cass.aaf.osaaf.org:<Cass IP> # AAF Machine info -aaf_env=DEV -aaf_register_as=$HOSTNAME -cadi_latitude= -cadi_longitude= +AAF_ENV=DEV +AAF_REGISTER_AS=$HOSTNAME +LATITUDE= +LONGITUDE= diff --git a/auth/docker/dbounce.sh b/auth/docker/dbounce.sh index e6367957..82aedd0c 100644 --- a/auth/docker/dbounce.sh +++ b/auth/docker/dbounce.sh @@ -1,4 +1,4 @@ #!/bin/bash -sh ./dstop.sh "$@" -sh ./dstart.sh "$@" +bash ./dstop.sh "$@" +bash ./dstart.sh "$@" diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 10ca9d95..da0b9b64 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -24,7 +24,6 @@ docker build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample # Clean up rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar cd - - ######## # Second, build a core Docker Image echo Building aaf_$AAF_COMPONENT... |