Merge pull request #13218 from Habbie/docker-compose-space

switch from `docker-compose` to `docker compose` and stop installing docker-compose because that uninstalls runc
PowerDNS · Sep 6, 2023 · 8dfbc47 · 8dfbc47
2 parents 428a10f + 1eeedb0
commit 8dfbc47
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -90,7 +90,6 @@
     'curl',
     'default-jre-headless',
     'dnsutils',
-    'docker-compose',
     'faketime',
     'gawk',
     'krb5-user',