Update CI to use docker-compose v2

Author: Nemo157

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db
+          docker compose up -d db
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -61,7 +61,7 @@ jobs:
             -- --all-targets --all-features
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   build:
     runs-on: ubuntu-latest
@@ -112,7 +112,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db s3
+          docker compose up -d db s3
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -128,7 +128,7 @@ jobs:
           done
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   GUI_test:
     runs-on: ubuntu-latest
@@ -147,7 +147,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db s3
+          docker compose up -d db s3
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -157,7 +157,7 @@ jobs:
         run: ./dockerfiles/run-gui-tests.sh
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   build_tests:
     runs-on: ubuntu-latest
@@ -176,7 +176,7 @@ jobs:
         run: |
           cp .env.sample .env
           mkdir -p ${DOCSRS_PREFIX}/public-html
-          docker-compose up -d db s3
+          docker compose up -d db s3
           # Give the database enough time to start up
           sleep 5
           # Make sure the database is actually working
@@ -194,7 +194,7 @@ jobs:
           done
 
       - name: Clean up the database
-        run: docker-compose down --volumes
+        run: docker compose down --volumes
 
   fmt:
     name: Rustfmt

dockerfiles/run-gui-tests.sh

@@ -3,9 +3,9 @@
 set -e
 
 # Just in case it's running, we stop the web server.
-docker-compose stop web
+docker compose stop web
 
-docker-compose up -d db s3
+docker compose up --wait --wait-timeout 30 db s3
 
 # If we have a .env file, we need to temporarily move it so
 # it doesn't make sqlx fail compilation.
@@ -35,6 +35,6 @@ cargo run -- start-web-server &
 SERVER_PID=$!
 
 # status="docker run . -v `pwd`:/build/out:ro gui_tests"
-docker-compose run gui_tests
+docker compose run gui_tests
 status=$?
 exit $status