Merge pull request #13273 from Habbie/backport-13194-to-auth-4.7.x

auth-4.7.x: switch from `docker-compose` to `docker compose` and stop installing docker-compose because that uninstalls runc
PowerDNS · Sep 25, 2023 · 814b387 · 814b387
2 parents 6e00f2c + 1aaf8a2
commit 814b387
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests
@@ -34,13 +34,13 @@ fi
 ignore="-I test_GSSTSIG.py"
 if [ "${WITHKERBEROS}" = "YES" ]; then
     ignore=""
-    (cd kerberos-server && docker-compose up --detach --build)
+    (cd kerberos-server && docker compose up --detach --build)
 fi
 
 nosetests --with-xunit $ignore $@
 ret=$?
 
 if [ "${WITHKERBEROS}" = "YES" ]; then
-    (cd kerberos-server && docker-compose stop || exit 0)
+    (cd kerberos-server && docker compose stop || exit 0)
 fi
 exit $ret
diff --git a/tasks.py b/tasks.py
@@ -85,7 +85,6 @@
     'curl',
     'default-jre-headless',
     'dnsutils',
-    'docker-compose',
     'faketime',
     'gawk',
     'krb5-user',