switch from `docker-compose` to `docker compose` and

stop installing docker-compose because that uninstalls runc

(cherry picked from commit 5bb9f0fcd0c63a8ea31bc150e29b47b301009696)

diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests
index 805f2af8771bc7674d47ec25b7550604efce1c28..4b2c971a68075aea218f498e11ed9bd934cb56d3 100755 (executable)
--- 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
index 0e14a44132fbed118ac9387ee2fb83fd7d73d76e..3fe9630a151e5221c8aece9aa516f689a3a4c5f5 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -85,7 +85,6 @@ auth_test_deps = [   # FIXME: we should be generating some of these from shlibde
     'curl',
     'default-jre-headless',
     'dnsutils',
-    'docker-compose',
     'faketime',
     'gawk',
     'krb5-user',