From af477a9bb40519edba3ad7a100ada777ae994bb9 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephen@that.guru>
Date: Wed, 23 Oct 2024 17:53:48 +0100
Subject: [PATCH] CI: docker-compose -> docker compose

Per [1].

[1] https://github.com/orgs/community/discussions/116610

Signed-off-by: Stephen Finucane <stephen@that.guru>
---
 .github/workflows/ci.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a4a65789..70e1b03c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -135,30 +135,30 @@ jobs:
           python-version: "3.12"
       - name: Build docker-compose service
         run: |
-          docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
+          docker compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
       - name: Test createsuperuser/changepassword
         run: |
-          docker-compose run -T --rm web \
+          docker compose run -T --rm web \
               python manage.py createsuperuser \
               --username patchwork --no-input --email test@example.com
           { echo patchwork; echo patchwork; } | \
-              docker-compose run -T --rm web \
+              docker compose run -T --rm web \
               python manage.py changepassword patchwork
       # FIXME(stephenfin): Re-enable this once dbbackup supports Django 4.0
       # - name: Test dbbackup/dbrestore
       #   run: |
-      #     docker-compose run -T --rm web python manage.py dbbackup
-      #     echo y | docker-compose run -T --rm web python manage.py dbrestore
+      #     docker compose run -T --rm web python manage.py dbbackup
+      #     echo y | docker compose run -T --rm web python manage.py dbrestore
       - name: Modify database user permissions (mysql)
         if: ${{ matrix.db == 'mysql' }}
         run: |
-          docker-compose exec -T -- db \
+          docker compose exec -T -- db \
               sh -c "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* to '\${MYSQL_USER}'@'%'; FLUSH PRIVILEGES;\""
       - name: Run unittest
-        run: docker-compose run -T --rm web tox
+        run: docker compose run -T --rm web tox
       - name: Test normal startup
         run: |
-          docker-compose up --detach
+          docker compose up --detach
 
           for count in $(seq 50); do \
             if curl --fail --silent "http://localhost:8000"; then \
@@ -168,7 +168,7 @@ jobs:
           done
           echo
 
-          docker-compose ps
+          docker compose ps
       - name: Test client access (git-pw)
         run: |
           python -m pip install git-pw
@@ -177,4 +177,4 @@ jobs:
               --username patchwork --password patchwork series list
       - name: Dump container logs
         if: ${{ always() }}
-        run: docker-compose logs --no-color --timestamps
+        run: docker compose logs --no-color --timestamps