Browse Source

tool,nextcloud: Use php instead of apache2 as webserver

pull/416/head
jld3103 1 year ago
parent
commit
a77b6e4b5c
No known key found for this signature in database
GPG Key ID: 9062417B9E8EB7B3
  1. 4
      packages/nextcloud/test/helper.dart
  2. 2
      tool/Dockerfile.dev

4
packages/nextcloud/test/helper.dart

@ -47,7 +47,7 @@ class DockerContainer {
); );
Future<String> collectLogs() async { Future<String> collectLogs() async {
final apacheLogs = (await runExecutableArguments( final serverLogs = (await runExecutableArguments(
'docker', 'docker',
[ [
'logs', 'logs',
@ -68,7 +68,7 @@ class DockerContainer {
)) ))
.stdout as String; .stdout as String;
return '$apacheLogs\n\n$nextcloudLogs'; return '$serverLogs\n\n$nextcloudLogs';
} }
} }

2
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 && \ 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 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/ COPY --chown=www-data:www-data overlay /usr/src/nextcloud/
CMD ["php", "-S", "0.0.0.0:80"]

Loading…
Cancel
Save