]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
switch from `docker-compose` to `docker compose` and
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 29 Aug 2023 13:07:19 +0000 (15:07 +0200)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Wed, 30 Aug 2023 08:40:30 +0000 (10:40 +0200)
stop installing docker-compose because that uninstalls runc

regression-tests.auth-py/runtests
tasks.py

index 805f2af8771bc7674d47ec25b7550604efce1c28..4b2c971a68075aea218f498e11ed9bd934cb56d3 100755 (executable)
@@ -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
index 96f22089744b98a0da1fff383cbde3bd333e729d..a03cc2cf801ea6a52c5bf7ec1bfae75aa9114fef 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -86,7 +86,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',