diff options
| author |   Vijay <vv770d@att.com> | 2017-09-15 19:46:07 +0000 |
|---|---|---|
| committer | Vijay <vv770d@att.com> | 2017-09-15 20:03:07 +0000 |
| commit | 6e63f2688ef741930943e46dd967b5b8f6513df2 (patch) | |
| tree | 09bbb7ae98bb1ae7e3ca701f30b7676e2dc40af4 /src | |
| parent | 81a9459485c857a9d8dac3162cb043f1946d96d4 (diff) | |
vescollector standalone docker support
Issue-Id:DCAEGEN2-82
Change-Id: Id309d0af08c8beb9c18dce08dc51344e60f494a4
Signed-off-by: Vijay <vv770d@att.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scripts/build.sh | 23 | ||||
| -rw-r--r-- | src/main/scripts/docker-entry.sh | 15 |
2 files changed, 12 insertions, 26 deletions
diff --git a/src/main/scripts/build.sh b/src/main/scripts/build.sh deleted file mode 100644 index cc91edbb..00000000 --- a/src/main/scripts/build.sh +++ /dev/null @@ -1,23 +0,0 @@ - -### -# ============LICENSE_START======================================================= -# PROJECT -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -#docker build --force-rm --file Dockerfile -t dcae-controller-ves-collector:latest -sudo docker build -t dcae-controller-ves-collector:1.1.3 . diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh index 58f40b40..f5ddedb0 100644 --- a/src/main/scripts/docker-entry.sh +++ b/src/main/scripts/docker-entry.sh @@ -18,10 +18,19 @@ # limitations under the License. # ============LICENSE_END========================================================= ### -#echo \$COLLECTOR_IP \$(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts + +if [ ! -z "$COLLECTOR_IP" ]; then + echo $COLLECTOR_IP $(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts +fi + +if [ ! -z "$DMAAPHOST" ]; then + echo $DMAAPHOST onap.dmaap.org >> /etc/hosts +else + echo "DMAAPHOST ENV NOT SET!! PUBLISH WILL NOT BE SUPPORTED" +fi + if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then - echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP; DMAAP PUBLISH NOT SUPPORTED" - # /opt/app/manager/start-manager.sh + echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP" else echo "INFO: USING DCAEGEN2 CONTROLLER" fi |