Merge pull request #2480 from camptocamp/docker-compose

Use Docker Compose version 2

.github/workflows/rebuild-115.yaml

@@ -48,22 +48,22 @@ jobs:
 
       - name: Start
         run: |
-          docker-compose up -d
+          docker compose up -d
 
           # Wait for DB to be up
-          while ! docker-compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests
+          while ! docker compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests
           do
             echo "Waiting for DB to be UP"
             sleep 1
           done
         timeout-minutes: 2
       - name: Test
         run: |
-          docker-compose exec -T test pytest
+          docker compose exec -T test pytest
 
-          docker-compose down
+          docker compose down
 
-      - run: docker-compose logs
+      - run: docker compose logs
         if: failure()
 
       - run: python3 -m pip install --requirement=requirements-publish.txt

README.md

@@ -72,13 +72,13 @@ Setup your environment:
 ```bash
 touch tilecloud_chain/OpenLayers.js
 docker build --tag camptocamp/tilecloud-chain .
-docker-compose -p tilecloud up
+docker compose -p tilecloud up
 ```
 
 To run the tests:
 
 ```bash
-docker-compose -p tilecloud exec test python setup.py nosetests --logging-filter=tilecloud,tilecloud_chain --attr '!'nopy3
+docker compose -p tilecloud exec test python setup.py nosetests --logging-filter=tilecloud,tilecloud_chain --attr '!'nopy3
 ```
 
 ## Documentation