aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Müller <marcel-mueller@gmx.de>2025-05-01 11:15:48 +0200
committerMarcel Müller <marcel-mueller@gmx.de>2025-05-01 11:15:48 +0200
commit99d23a434c3f2ab98bb5f5307b58fdc7b592d0eb (patch)
tree1b660db99de87356e5fcd8f4b2c0c7899a377514
parent3cf7b8ddbeb14646e87c26964a7913115a3bbeef (diff)
downloadnextcloud-server-fix/noid/flaky-sso-tests.tar.gz
nextcloud-server-fix/noid/flaky-sso-tests.zip
fix: Ensure samba is started in kerberos testsfix/noid/flaky-sso-tests
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
-rwxr-xr-xapps/files_external/tests/sso-setup/start-apache.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_external/tests/sso-setup/start-apache.sh b/apps/files_external/tests/sso-setup/start-apache.sh
index eb2ff55b0e6..58ad71e3a3a 100755
--- a/apps/files_external/tests/sso-setup/start-apache.sh
+++ b/apps/files_external/tests/sso-setup/start-apache.sh
@@ -15,6 +15,9 @@ APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
docker exec apache chown 33 /var/www/html/config /var/www/html/data /var/www/html/extra-apps
docker cp "$SCRIPT_DIR/apps.config.php" apache:/var/www/html/config/apps.config.php
+# ensure that samba is started (see https://github.com/icewind1991/samba-krb-test/pull/8)
+docker exec dc service samba-ad-dc status || docker exec dc service samba-ad-dc start
+
# add the dns record for apache
docker exec dc samba-tool dns add krb.domain.test domain.test httpd A $APACHE_IP -U administrator --password=passwOrd1 1>&2