merge: #34 from ginger/docker-compose-cmd

NaturalHistoryMuseum · Aug 15, 2024 · 783757a · 783757a
2 parents c8bf371 + 34ed768
commit 783757a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,9 +13,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build images
-        run: docker-compose build
+        run: docker compose build
 
       - name: Run tests
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        run: docker-compose run -e COVERALLS_REPO_TOKEN ckan bash /opt/scripts/run-tests.sh -c ckanext.status
+        run: docker compose run -e COVERALLS_REPO_TOKEN ckan bash /opt/scripts/run-tests.sh -c ckanext.status
diff --git a/README.md b/README.md
@@ -82,7 +82,6 @@ Installing from a `pyproject.toml` in editable mode (i.e. `pip install -e`) requ
 # Usage
 
 <!--usage-start-->
-
 ## Status bar
 
 To turn the status bar on, login as a sysadmin and head to the system configuration page.
@@ -133,15 +132,15 @@ To run the tests against ckan 2.9.x on Python3:
 
 1. Build the required images:
    ```shell
-   docker-compose build
+   docker compose build
    ```
 
 2. Then run the tests.
    The root of the repository is mounted into the ckan container as a volume by the Docker compose
    configuration, so you should only need to rebuild the ckan image if you change the extension's
    dependencies.
    ```shell
-   docker-compose run ckan
+   docker compose run ckan
    ```
 
 <!--testing-end-->