diff options
| author |   Vijay <vv770d@att.com> | 2017-09-11 02:11:01 +0000 |
|---|---|---|
| committer | Vijay <vv770d@att.com> | 2017-09-11 16:15:56 +0000 |
| commit | e1ab69fa9c80ecfd5ab5bd19da9d67af4e1107fb (patch) | |
| tree | 15dc45e7a39f51bc9382653a38ed42fe303089a8 /src | |
| parent | 0f0cfa24a916979a8e500b127bcfbac0b9870ad8 (diff) | |
update ves buildscript & fix build error
https://jenkins.onap.org/view/dcagen2/job/dcaegen2-collectors-ves-master-release-version-java-daily/13/console
Change-Id: I21bedaebedd307c792fe7e38f8bc5b2d8875ef06
Issue-Id: DCAEGEN2-82
Signed-off-by: Vijay <vv770d@att.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/assembly/dep.xml | 8 | ||||
| -rw-r--r-- | src/main/scripts/docker-entry.sh | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/assembly/dep.xml b/src/assembly/dep.xml index 86f9ffc1..cb72aa4a 100644 --- a/src/assembly/dep.xml +++ b/src/assembly/dep.xml @@ -66,6 +66,13 @@ </includes> <outputDirectory>specs</outputDirectory> </fileSet> + <fileSet> + <directory>./</directory> + <includes> + <include>Dockerfile</include> + </includes> + <outputDirectory>./</outputDirectory> + </fileSet> </fileSets> <dependencySets> <dependencySet> @@ -76,3 +83,4 @@ </dependencySet> </dependencySets> </assembly> + diff --git a/src/main/scripts/docker-entry.sh b/src/main/scripts/docker-entry.sh index e8766d6f..112318b2 100644 --- a/src/main/scripts/docker-entry.sh +++ b/src/main/scripts/docker-entry.sh @@ -1,5 +1,4 @@ #!/bin/sh - ### # ============LICENSE_START======================================================= # PROJECT @@ -19,8 +18,7 @@ # limitations under the License. # ============LICENSE_END========================================================= ### - - +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 @@ -30,3 +28,4 @@ else /opt/app/VESCollector/bin/VESrestfulCollector.sh start & fi #while true; do sleep 1000; done + |