From a77b6e4b5c13eed50c9964baedd5a8ff34ca1150 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 25 Jun 2023 09:26:56 +0200 Subject: [PATCH] tool,nextcloud: Use php instead of apache2 as webserver --- packages/nextcloud/test/helper.dart | 4 ++-- tool/Dockerfile.dev | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/nextcloud/test/helper.dart b/packages/nextcloud/test/helper.dart index c2bf6d1a..c460c890 100644 --- a/packages/nextcloud/test/helper.dart +++ b/packages/nextcloud/test/helper.dart @@ -47,7 +47,7 @@ class DockerContainer { ); Future collectLogs() async { - final apacheLogs = (await runExecutableArguments( + final serverLogs = (await runExecutableArguments( 'docker', [ 'logs', @@ -68,7 +68,7 @@ class DockerContainer { )) .stdout as String; - return '$apacheLogs\n\n$nextcloudLogs'; + return '$serverLogs\n\n$nextcloudLogs'; } } diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index f66dc4ff..8123ec9f 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -20,3 +20,5 @@ RUN (bash /entrypoint.sh php -S 0.0.0.0:8080 &) && \ until curl -s -o /dev/null http://localhost:8080/status.php; do true; done && \ for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost:8080/ocs/v2.php/cloud/user; done COPY --chown=www-data:www-data overlay /usr/src/nextcloud/ + +CMD ["php", "-S", "0.0.0.0:80"]