Merge remote-tracking branch 'origin/master' into dependabot/maven/or…

…g.springdoc-springdoc-openapi-starter-webmvc-ui-2.7.0

.github/workflows/bridge-logistics-e2e.yml

@@ -22,6 +22,11 @@ jobs:
           command: |
             make dcup-full-action
 
+      - name: Cypress Fail!
+        if: failure()
+        run: |
+          make docker-logs
+
       - name: Build Cypress
         run: make build-npm-cypress
 
@@ -47,6 +52,11 @@ jobs:
           command: |
             make dcup-full-action
 
+      - name: Cypress Fail!
+        if: failure()
+        run: |
+          make docker-logs
+
       - name: Build Cypress
         run: make build-npm-cypress
 
@@ -72,6 +82,11 @@ jobs:
           command: |
             make dcup-full-action
 
+      - name: Cypress Fail!
+        if: failure()
+        run: |
+          make docker-logs
+
       - name: Build Cypress
         run: make build-npm-cypress
 
@@ -97,6 +112,11 @@ jobs:
           command: |
             make dcup-full-action
 
+      - name: Cypress Fail!
+        if: failure()
+        run: |
+          make docker-logs
+
       - name: Build Cypress
         run: make build-npm-cypress
 

Makefile

@@ -240,6 +240,9 @@ docker-prune:
 	docker system prune --all -f
 	docker builder prune -f
 	docker system prune --all --volumes -fl
+docker-logs:
+	cd e2e; \
+	make docker-logs
 install-coverage-python:
 	sudo apt install python3-pip -y
 	sudo pip3 install coverage

e2e/Makefile

@@ -18,3 +18,5 @@ cypress-edge:
 	docker-compose -p ${GITHUB_RUN_ID} -f ../docker-compose.yml -f docker-compose.yml up --exit-code-from e2e-edge e2e-edge
 build:
 	yarn
+docker-logs:
+	docker-compose -p ${GITHUB_RUN_ID} -f ../docker-compose.yml -f docker-compose.yml logs