summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scripts/build.sh23
-rw-r--r--src/main/scripts/docker-entry.sh15
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