diff options
| -rw-r--r-- | Dockerfile | 11 | ||||
| -rw-r--r-- | src/main/scripts/docker-entry.sh | 13 |
2 files changed, 17 insertions, 7 deletions
@@ -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 |