From 1aaf8a2a9dc2168c761c975b607cb5bdc707c6cb Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 29 Aug 2023 15:07:19 +0200 Subject: [PATCH] switch from `docker-compose` to `docker compose` and stop installing docker-compose because that uninstalls runc (cherry picked from commit 5bb9f0fcd0c63a8ea31bc150e29b47b301009696) --- regression-tests.auth-py/runtests | 4 ++-- tasks.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests index 805f2af877..4b2c971a68 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 && 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 0e14a44132..3fe9630a15 100644 --- 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', -- 2.47.2