Including containers in Jenkins network, setting mvc front name

giis-uniovi · Nov 7, 2023 · 77c6bc4 · 77c6bc4
1 parent 45a30df
commit 77c6bc4
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 25 deletions.
diff --git a/retorchfiles/scripts/coilifecycles/coi-setup.sh b/retorchfiles/scripts/coilifecycles/coi-setup.sh
@@ -9,11 +9,11 @@ mkdir -p "$WORKSPACE/artifacts"
 
 cd "$SUT_LOCATION/src"
 
-docker compose --env-file .env  build
-docker compose --env-file .env  up -d
+docker compose  -f docker-compose.yml -f docker-compose.override.yml  --env-file .env  build
+docker compose -f docker-compose.yml -f docker-compose.override.yml --env-file .env  up -d
 
-sleep 60
-#$WORKSPACE/retorchfiles/scripts/waitforeShopContainers.sh
+
+$WORKSPACE/retorchfiles/scripts/waitforeShopContainers.sh "https://webmvc:5100/"
 
 cd $WORKSPACE
 

diff --git a/retorchfiles/scripts/waitforeShopContainers.sh b/retorchfiles/scripts/waitforeShopContainers.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 COUNTER=0
 sleep 15
-URL="http://156.35.119.57:5100/"
-until curl --insecure -s "${URL}" | grep -q "<div class=\"esh-catalog-item col-md-4\">"; do
-  echo "waiting $COUNTER for $1 wit URL $URL "
+until curl --insecure -s "${1}" | grep -q "<div class=\"esh-catalog-item col-md-4\">"; do
+  echo "waiting $COUNTER for $1 wit URL"
   sleep 4
   COUNTER=$(expr $COUNTER + 1)
   if test "$COUNTER" -gt 80; then

diff --git a/sut/src/docker-compose.override.yml b/sut/src/docker-compose.override.yml
@@ -12,7 +12,8 @@ services:
       - ACCEPT_EULA=Y
     ports:
       - "5340:80"
-
+    networks:
+      - jenkins_network
   sqldata:
     environment:
       - SA_PASSWORD=Pass@word
@@ -21,23 +22,28 @@ services:
       - "5433:1433"
     volumes:
       - eshop-sqldata:/var/opt/mssql
-
+    networks:
+      - jenkins_network
   nosqldata:
     ports:
       - "27017:27017"
     volumes:
       - eshop-nosqldata:/data/db
-
+    networks:
+      - jenkins_network
   basketdata:
     ports:
       - "6379:6379"
     volumes:
       - eshop-basketdata:/data
+    networks:
+      - jenkins_network
   rabbitmq:
     ports:
       - "15672:15672"
       - "5672:5672"
-
+    networks:
+      - jenkins_network
   identity-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -57,7 +63,8 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
       - "5105:80"
-
+    networks:
+      - jenkins_network
   basket-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -77,7 +84,8 @@ services:
     ports:
       - "5103:80"
       - "9103:81"
-
+    networks:
+      - jenkins_network
   catalog-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -99,7 +107,8 @@ services:
     ports:
       - "5101:80"
       - "9101:81"
-
+    networks:
+      - jenkins_network
   ordering-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -124,7 +133,8 @@ services:
     ports:
       - "5102:80"
       - "9102:81"
-
+    networks:
+      - jenkins_network
   ordering-backgroundtasks:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -142,7 +152,8 @@ services:
       - UseLoadTest=${USE_LOADTEST:-False}
     ports:
       - "5111:80"
-
+    networks:
+      - jenkins_network
   payment-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -155,7 +166,8 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
       - "5108:80"
-
+    networks:
+      - jenkins_network
   webhooks-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -168,21 +180,24 @@ services:
       - Identity__ExternalUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5113:80"
-
+    networks:
+      - jenkins_network
   mobileshoppingapigw:
     volumes:
       - ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
     ports:
     - "5200:80"
     - "15200:8001"
-
+    networks:
+      - jenkins_network
   webshoppingapigw:
     volumes:
       - ./ApiGateways/Envoy/config/webshopping:/etc/envoy
     ports:
     - "5202:80"
     - "15202:8001"
-
+    networks:
+      - jenkins_network
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -202,7 +217,8 @@ services:
       - Identity__ExternalUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5120:80"
-
+    networks:
+      - jenkins_network
   webshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -226,7 +242,8 @@ services:
       - Identity__ExternalUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5121:80"
-
+    networks:
+      - jenkins_network
   ordering-signalrhub:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -240,7 +257,8 @@ services:
       - Identity__Url=http://identity-api
     ports:
       - "5112:80"
-
+    networks:
+      - jenkins_network
   webstatus:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -271,7 +289,8 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
       - "5107:80"
-
+    networks:
+      - jenkins_network
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
@@ -285,8 +304,10 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
       - "5104:80"
-
+    networks:
+      - jenkins_network
   webmvc:
+    container_name: webmvc
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -300,6 +321,8 @@ services:
       - UseLoadTest=${USE_LOADTEST:-False}
     ports:
       - "5100:80"
+    networks:
+      - jenkins_network
 
   webhooks-client:
     environment:
@@ -311,11 +334,16 @@ services:
       - SelfUrl=http://webhooks-client/
     ports:
       - "5114:80"
+    networks:
+      - jenkins_network
 volumes:
   eshop-sqldata:
     external: false
   eshop-nosqldata:
     external: false
   eshop-basketdata:
     external: false
+networks:
+  jenkins_network:
+    external: true