diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/dmaap-buscontroller/dr-launch.sh | 3 | ||||
-rwxr-xr-x | scripts/get-instance-ip.sh | 2 | ||||
-rw-r--r-- | scripts/vid/start_vid_containers.sh | 17 |
3 files changed, 18 insertions, 4 deletions
diff --git a/scripts/dmaap-buscontroller/dr-launch.sh b/scripts/dmaap-buscontroller/dr-launch.sh index abc0aae8..bba1b73d 100644 --- a/scripts/dmaap-buscontroller/dr-launch.sh +++ b/scripts/dmaap-buscontroller/dr-launch.sh @@ -20,9 +20,8 @@ function dmaap_dr_launch() { git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master cd datarouter git pull - cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ + cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources - sed -i 's/10003/10001/g' docker-compose.yml # start DMaaP DR containers with docker compose and configuration from docker-compose.yml docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d diff --git a/scripts/get-instance-ip.sh b/scripts/get-instance-ip.sh index c4ca82cf..a236c025 100755 --- a/scripts/get-instance-ip.sh +++ b/scripts/get-instance-ip.sh @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -docker inspect --format '{{ .NetworkSettings.IPAddress }}' $1 +docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $1 diff --git a/scripts/vid/start_vid_containers.sh b/scripts/vid/start_vid_containers.sh index a058e1fb..c8804349 100644 --- a/scripts/vid/start_vid_containers.sh +++ b/scripts/vid/start_vid_containers.sh @@ -17,6 +17,8 @@ # 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. +# +# Modifications copyright (c) 2018 Nokia Intellectual Property # ============LICENSE_END============================================ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. @@ -33,8 +35,21 @@ docker-compose up -d --build TIME_OUT=1200 INTERVAL=5 TIME=0 + + for i in {1..10}; do + if [ $(docker inspect -f '{{ .State.Running }}' vid-server) ] + then + echo "VID service is running" + VID_DOCKER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vid-server) + break + else + echo "Waiting for vid-server docker initialization... $i" + sleep $i + fi + done + while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/vid/healthCheck); echo $response + response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://"$VID_DOCKER_IP":8080/vid/healthCheck); echo $response if [ "$response" == "200" ]; then echo VID and its database well started in $TIME seconds |