summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay <vv770d@att.com>2017-09-14 20:25:14 +0000
committerVijay <vv770d@att.com>2017-09-14 20:25:28 +0000
commit551a1d2b43090f66404a042bd5a073af0f4e0797 (patch)
tree6682699aa9dbbb651af923b47953c3fa66f3c482
parent267a324c57d2e61db2e9249f06b9fd341d6fd8c3 (diff)
fix docker startup error
Change-Id: I99193af68b18d540c1af04095caa48d16b3d4184 Issue-Id:DCAEGEN2-82 Signed-off-by: Vijay <vv770d@att.com>
-rw-r--r--Dockerfile11
-rw-r--r--src/main/scripts/docker-entry.sh13
2 files changed, 17 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile
index 135c05c5..d0474235 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,22 @@ FROM ubuntu:16.04
MAINTAINER vv770d@att.com
-WORKDIR /opt/app/manager
+WORKDIR /opt/app/VESCollector
ENV http_proxy http://one.proxy.att.com:8080
ENV https_proxy http://one.proxy.att.com:8080
ENV HOME /opt/app/VESCollector
ENV JAVA_HOME /usr
+RUN apt-get update && apt-get install -y \
+ bc \
+ curl \
+ telnet \
+ vim \
+ netcat \
+ openjdk-8-jdk
+
+
COPY opt /opt
EXPOSE 9999 8080 8443
diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh
index 112318b2..58f40b40 100644
--- a/src/main/scripts/docker-entry.sh
+++ b/src/main/scripts/docker-entry.sh
@@ -18,14 +18,15 @@
# limitations under the License.
# ============LICENSE_END=========================================================
###
-echo \$COLLECTOR_IP \$(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts
+#echo \$COLLECTOR_IP \$(hostname).dcae.simpledemo.openecomp.org >> /etc/hosts
if [ -z "$CONSUL_HOST" ] || [ -z "$CONFIG_BINDING_SERVICE" ] || [ -z "$HOSTNAME" ]; then
- echo "INFO: USING STANDARD CONTROLLER"
- /opt/app/manager/start-manager.sh
+ echo "INFO: USING STANDARD ALONE CONFIGURATION SETUP; DMAAP PUBLISH NOT SUPPORTED"
+ # /opt/app/manager/start-manager.sh
else
echo "INFO: USING DCAEGEN2 CONTROLLER"
- /opt/app/VESCollector/bin/VESrestfulCollector.sh stop
- /opt/app/VESCollector/bin/VESrestfulCollector.sh start &
fi
-#while true; do sleep 1000; done
+/opt/app/VESCollector/bin/VESrestfulCollector.sh stop
+/opt/app/VESCollector/bin/VESrestfulCollector.sh start &
+
+while true; do sleep 1000; done