Merge branch 'wiremock:master' into fix/make-reset-request-journal-for-v3

Author: alexjrk

.github/workflows/tests.yml

@@ -44,6 +44,6 @@ jobs:
 
       - name: Integration Tests
         run: |
-          cd examples/
-          docker-compose build overview_srv
-          docker-compose run overview_srv pytest --tb=short
+          cd examples/intro/
+          docker compose build overview_srv
+          docker compose run overview_srv pytest --tb=short

examples/intro/README.md

@@ -42,7 +42,7 @@ to allow us to write solid integration tests that dont involved mockig the code
 
 To run the tests use docker-compose to create the necessary containers.
 
-`docker-compose run overview_srv pytest --tb=short`
+`docker compose run overview_srv pytest --tb=short`
 
 ## How we use this example code base
 

examples/intro/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   overview_srv:
     build:
-      context: ../
+      context: ../../
       dockerfile: examples/intro/Dockerfile
     ports:
       - "5001:5001"
@@ -13,17 +13,17 @@ services:
       - "host.docker.internal:host-gateway"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ..:/app/
+      - ../../:/app/
       - .:/app/example/
     command: uvicorn product_mock.overview_service:app --host=0.0.0.0 --port=5001
 
   products_srv:
     build:
-      context: ../
+      context: ../../
       dockerfile: examples/intro/Dockerfile
     ports:
       - "5002:5002"
     volumes:
-      - ..:/app/
+      - ../../:/app/
       - .:/app/example/
     command: uvicorn product_mock.products_service:app --host=0.0.0.0 --port=5002