From 3cf7b8ddbeb14646e87c26964a7913115a3bbeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 1 May 2025 11:15:24 +0200 Subject: [PATCH 1/2] chore: Add logs for dc and apache container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- .github/workflows/files-external-smb-kerberos.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/files-external-smb-kerberos.yml b/.github/workflows/files-external-smb-kerberos.yml index cb5d48dfe164f..cc3d7011f7ff3 100644 --- a/.github/workflows/files-external-smb-kerberos.yml +++ b/.github/workflows/files-external-smb-kerberos.yml @@ -83,6 +83,18 @@ jobs: run: | apps/files_external/tests/sso-setup/test-sso-smb.sh ${{ env.DC_IP }} + - name: Show logs DC + if: always() + run: | + docker logs dc + echo "------------" + docker exec dc cat /var/log/samba/log.samba + + - name: Show logs Apache + if: always() + run: | + docker logs apache + - name: Show logs if: always() run: | From 99d23a434c3f2ab98bb5f5307b58fdc7b592d0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 1 May 2025 11:15:48 +0200 Subject: [PATCH 2/2] fix: Ensure samba is started in kerberos tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- apps/files_external/tests/sso-setup/start-apache.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/files_external/tests/sso-setup/start-apache.sh b/apps/files_external/tests/sso-setup/start-apache.sh index eb2ff55b0e697..58ad71e3a3ac4 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