Merge branch 'main' into adding-logging

Author: ORybak5

.github/workflows/build_workflow.yml

@@ -241,8 +241,10 @@ jobs:
           GP2GP_LOGGING_LEVEL: "DEBUG"
           MHS_MOCK_REQUEST_JOURNAL_ENABLED: "true"
         run: |
-          docker network create commonforgp2gp
-          docker compose -f docker-compose.yml -f docker-compose-e2e-tests.yml up --build --exit-code-from gp2gp-e2e-tests mongodb activemq gp2gp wiremock gpcc gp2gp-e2e-tests
+          source ./vars.local.e2e.sh
+          docker network create commonforgp2gp || true
+          docker compose -f ./docker-compose.yml -f ./docker-compose-e2e-tests.yml build
+          docker compose -f ./docker-compose.yml -f ./docker-compose-e2e-tests.yml up --exit-code-from gp2gp-e2e-tests mongodb activemq gp2gp wiremock gpcc gp2gp-e2e-tests
         working-directory: ./docker
 
       - name: Dump Docker Logs

docker/run-e2e-tests.sh

@@ -10,5 +10,5 @@ fi
 if [[ "$(docker network ls | grep "commonforgp2gp")" == "" ]] ; then
     docker network create commonforgp2gp
 fi
-docker-compose -f docker-compose.yml -f docker-compose-e2e-tests.yml build gp2gp-e2e-tests
-docker-compose -f docker-compose.yml -f docker-compose-e2e-tests.yml up --exit-code-from gp2gp-e2e-tests gp2gp-e2e-tests
+docker compose -f docker-compose.yml -f docker-compose-e2e-tests.yml build gp2gp-e2e-tests
+docker compose -f docker-compose.yml -f docker-compose-e2e-tests.yml up --exit-code-from gp2gp-e2e-tests gp2gp-e2e-tests