Replace docker-compose with docker compose

see announcement at the top of
https://github.com/actions/runner-images/blob/ubuntu22/20240401.4/images/ubuntu/Ubuntu2204-Readme.md

.github/workflows/integration_bugtracker.yml

@@ -27,8 +27,8 @@ jobs:
 
     - name: Dockerize
       run: |
-        docker-compose -f tests/${{ matrix.tracker}}/docker-compose.yml build
-        docker-compose -f tests/${{ matrix.tracker}}/docker-compose.yml up -d
+        docker compose -f tests/${{ matrix.tracker}}/docker-compose.yml build
+        docker compose -f tests/${{ matrix.tracker}}/docker-compose.yml up -d
         sleep 10
 
         IP_ADDR=`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' bugtracker_kiwitcms_org`

.github/workflows/sanity.yml

@@ -61,8 +61,8 @@ jobs:
 
     - name: Create database
       run: |
-        docker-compose -f docker-compose.postgres pull db
-        docker-compose -f docker-compose.postgres run -d -p 5432:5432 --name kiwi_db db
+        docker compose -f docker-compose.postgres pull db
+        docker compose -f docker-compose.postgres run -d -p 5432:5432 --name kiwi_db db
 
     - name: migrations rollback
       run: |

.github/workflows/testing.yml

@@ -166,8 +166,8 @@ jobs:
 
       - name: Create database
         run: |
-          docker-compose pull db
-          docker-compose run -d -p 3306:3306 --name kiwi_db db
+          docker compose pull db
+          docker compose run -d -p 3306:3306 --name kiwi_db db
           docker images
           sleep 20  # wait to initialize
           docker exec -i kiwi_db mariadb -u root -pkiwi-1s-aw3s0m3 -e 'GRANT ALL PRIVILEGES ON test_kiwi.* TO kiwi;'
@@ -214,8 +214,8 @@ jobs:
 
       - name: Create database
         run: |
-          docker-compose -f docker-compose.postgres pull db
-          docker-compose -f docker-compose.postgres run -d -p 5432:5432 --name kiwi_db db
+          docker compose -f docker-compose.postgres pull db
+          docker compose -f docker-compose.postgres run -d -p 5432:5432 --name kiwi_db db
           docker images
 
       - name: Execute tests
@@ -297,8 +297,8 @@ jobs:
           docker --version
           docker --help
 
-          docker-compose --version
-          docker-compose --help
+          docker compose --version
+          docker compose --help
 
       - name: Execute tests
         run: |

docs/source/hardware_performance.rst

@@ -49,7 +49,7 @@ we often hear is *How many test execution results can Kiwi TCMS deal with?*
 
     - Client: t2.small in us-east-1a (same availability zone as server)
     - Server: t3.medium in use-east-1a, 30GB gp2 disk with 100 IOPS
-    - Kiwi TCMS v12.0 via ``docker-compose up``
+    - Kiwi TCMS v12.0 via ``docker compose up``
     - Database is ``mariadb:10.10.2`` with a persistent volume backed onto
       the host filesystem
     - Host OS - Amazon Linux, freshly provisioned, no changes from defaults

docs/source/installing_docker.rst

@@ -24,7 +24,7 @@ Clone the git repository::
 Then you can start Kiwi TCMS by executing::
 
     cd path/to/kiwi-tcms/
-    docker-compose up -d
+    docker compose up -d
 
 Your Kiwi TCMS instance will be accessible at https://localhost.
 
@@ -36,7 +36,7 @@ The above command will create two containers:
    image
 
 
-``docker-compose`` will also create two volumes for persistent data storage:
+``docker compose`` will also create two volumes for persistent data storage:
 ``kiwi_db_data`` and ``kiwi_uploads``.
 
 .. note::
@@ -159,10 +159,10 @@ Upgrading
 To upgrade running Kiwi TCMS containers execute the following commands::
 
     cd path/containing/docker-compose/
-    docker-compose down
+    docker compose down
     # !!! docker tag to keep older image version on the machine
-    docker-compose pull # to fetch latest versions from Docker Hub
-    docker-compose up -d
+    docker compose pull # to fetch latest versions from Docker Hub
+    docker compose up -d
     docker exec -it kiwi_web /Kiwi/manage.py upgrade
 
 .. warning::
@@ -421,7 +421,7 @@ The Kiwi TCMS container will print HTTPD logs on STDOUT!
 
 .. warning::
 
-    You must start the containers in the foreground with ``docker-compose up``,
+    You must start the containers in the foreground with ``docker compose up``,
     e.g. without the ``-d`` option in order to see their logs or use
     ``docker container logs [-f|--tail 1000] kiwi_web``!
 

tests/test_docker.sh

@@ -23,7 +23,7 @@ assert_perform_initdb() {
 
 rlJournalStart
     rlPhaseStartTest "[PostgreSQL] Container up"
-        rlRun -t -c "docker-compose -f docker-compose.postgres up -d"
+        rlRun -t -c "docker compose -f docker-compose.postgres up -d"
         assert_perform_initdb
         assert_up_and_running
     rlPhaseEnd
@@ -48,7 +48,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "[PostgreSQL] Container restart"
-        rlRun -t -c "docker-compose -f docker-compose.postgres restart"
+        rlRun -t -c "docker compose -f docker-compose.postgres restart"
         assert_up_and_running
     rlPhaseEnd
 
@@ -65,7 +65,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartCleanup "[PostgreSQL] Cleanup"
-        rlRun -t -c "docker-compose -f docker-compose.postgres down"
+        rlRun -t -c "docker compose -f docker-compose.postgres down"
 
         if [ -n "$ImageOS" ]; then
             rlRun -t -c "docker volume rm kiwi_db_data"
@@ -78,7 +78,7 @@ rlJournalStart
 
     # the rest of the scenarios use MariaDB by default
     rlPhaseStartTest "Container up"
-        rlRun -t -c "docker-compose up -d"
+        rlRun -t -c "docker compose up -d"
         assert_perform_initdb
         assert_up_and_running
     rlPhaseEnd
@@ -94,26 +94,26 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "Container restart"
-        rlRun -t -c "docker-compose restart"
+        rlRun -t -c "docker compose restart"
         assert_up_and_running
     rlPhaseEnd
 
     rlPhaseStartTest "Container stop & start"
-        rlRun -t -c "docker-compose stop"
+        rlRun -t -c "docker compose stop"
         sleep 5
-        rlRun -t -c "docker-compose start"
+        rlRun -t -c "docker compose start"
         assert_up_and_running
     rlPhaseEnd
 
     rlPhaseStartTest "Container kill & start"
-        rlRun -t -c "docker-compose kill"
+        rlRun -t -c "docker compose kill"
         sleep 5
-        rlRun -t -c "docker-compose start"
+        rlRun -t -c "docker compose start"
         assert_up_and_running
     rlPhaseEnd
 
     rlPhaseStartCleanup
-        rlRun -t -c "docker-compose down"
+        rlRun -t -c "docker compose down"
         if [ -n "$ImageOS" ]; then
             rlRun -t -c "docker volume rm kiwi_db_data"
         fi
@@ -122,15 +122,15 @@ rlJournalStart
     sleep 5
 
     rlPhaseStartTest "Start Kiwi TCMS with Docker Secrets"
-        rlRun -t -c "docker-compose -f docker-compose.with-secrets up -d"
+        rlRun -t -c "docker compose -f docker-compose.with-secrets up -d"
         sleep 10
 
         rlRun -t -c "docker exec -i kiwi_web /Kiwi/manage.py migrate"
         assert_up_and_running
     rlPhaseEnd
 
     rlPhaseStartCleanup
-        rlRun -t -c "docker-compose -f docker-compose.with-secrets down"
+        rlRun -t -c "docker compose -f docker-compose.with-secrets down"
         if [ -n "$ImageOS" ]; then
             rlRun -t -c "docker volume rm kiwi_db_data"
         fi

tests/test_http.sh

@@ -46,7 +46,7 @@ rlJournalStart
         WRK_DIR=$(mktemp -d ./wrk-logs-XXXX)
         chmod go+rwx "$WRK_DIR"
 
-        rlRun -t -c "docker-compose up -d"
+        rlRun -t -c "docker compose up -d"
         sleep 10
         rlRun -t -c "docker exec -i kiwi_web /Kiwi/manage.py migrate"
         assert_up_and_running
@@ -188,8 +188,8 @@ _EOF_
     rlPhaseEnd
 
     rlPhaseStartCleanup
-        rlRun -t -c "docker-compose logs --no-color > test_http_docker.log"
-        rlRun -t -c "docker-compose down"
+        rlRun -t -c "docker compose logs --no-color > test_http_docker.log"
+        rlRun -t -c "docker compose down"
         rm -f /tmp/testcookies.txt
         rm -f /tmp/testdata.txt
         if [ -n "$ImageOS" ]; then