diff options
author | 2018-10-19 15:22:16 +0000 | |
---|---|---|
committer | 2018-10-19 15:22:16 +0000 | |
commit | 1344ef2dd571923b5fa40f7c0863477df59d651b (patch) | |
tree | 8f5ec8e32f886384edc53c09ed13eeefeae8d945 /plans/usecases/5G-bulkpm | |
parent | 23bfc64539a212ad81ae62a1b5528799c6262771 (diff) |
Changes to docker fils due to Gerrit 70812
Change-Id: I4a3d722485fd0d47fae3e86f7b947d0e8b40e07e
Issue-ID: INT-649
Signed-off-by: LiamBurke <liam.burke@ericsson.com>
Diffstat (limited to 'plans/usecases/5G-bulkpm')
-rw-r--r-- | plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 10 | ||||
-rw-r--r-- | plans/usecases/5G-bulkpm/setup.sh | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index b9085d6e..c5567d81 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -9,9 +9,9 @@ services: - "8443:8443" - "8080:8080" volumes: - - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties - - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt - - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt + - ../prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties + - ../prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt + - ../prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt depends_on: mariadb_container: condition: service_healthy @@ -29,7 +29,7 @@ services: - "9443:8443" - "9090:8080" volumes: - - ./node_data/node.properties:/opt/app/datartr/etc/node.properties + - ../node_data/node.properties:/opt/app/datartr/etc/node.properties depends_on: datarouter-prov: condition: service_healthy @@ -41,7 +41,7 @@ services: ports: - "7070:7070" volumes: - - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties + - ../subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties mariadb_container: image: mariadb:10.2.14 diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index e409b52c..5139cbab 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -54,10 +54,11 @@ sleep 5 mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master -cd datarouter -cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ -rm -rf docker-compose.yml -cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources +mkdir docker-compose +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose +cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml + docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d docker kill datarouter-prov @@ -66,7 +67,7 @@ docker kill vescollector HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') sed -i -e '/DMAAPHOST:/ s/:.*/: '$HOST_IP'/' docker-compose.yml MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb ) -sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/prov_data/provserver.properties +sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties docker-compose up -d # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb |