From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 29 Aug 2023 13:07:19 +0000 (+0200)
Subject: switch from `docker-compose` to `sudo docker compose` and
X-Git-Tag: rec-5.0.0-alpha1~23^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13218%2Fhead;p=thirdparty%2Fpdns.git

switch from `docker-compose` to `sudo docker compose` and
stop installing docker-compose because that uninstalls runc
---

diff --git a/docs/changelog/4.8.rst b/docs/changelog/4.8.rst
index f1039c37eb..b8374f947f 100644
--- a/docs/changelog/4.8.rst
+++ b/docs/changelog/4.8.rst
@@ -33,7 +33,7 @@ Changelogs for 4.8.x
     :tags: Bug Fixes
     :pullreq: 12992
 
-    YaHTTP: Prevent integer overflow on very large chunks
+    YaHTTP: Prevent integer overflow on very 3large chunks
 
   .. change::
     :tags: Improvements
diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests
index 805f2af877..45c6d62f27 100755
--- 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 && sudo 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 && sudo docker compose stop || exit 0)
 fi
 exit $ret
diff --git a/tasks.py b/tasks.py
index 6115bd4ed5..ead7efb894 100644
--- a/tasks.py
+++ b/tasks.py
@@ -90,7 +90,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',