diff --git a/Dockerfile b/Dockerfile index 4d1fbd3..0f94412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,5 +66,5 @@ RUN apk add --no-progress --no-cache \ COPY rootfs / RUN chmod +x /usr/local/bin/* /etc/s6.d/*/run /etc/s6.d/.s6-svscan/* -VOLUME /etc/nginx/flarum /flarum/app/extensions /flarum/app/public/assets /var/log +VOLUME /etc/nginx/flarum /flarum/app/extensions /flarum/app/public/assets /var/log/flarum CMD ["/usr/local/bin/startup"] diff --git a/README.md b/README.md index e22af3a..f0dda03 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ - **/etc/nginx/flarum** : Nginx location directory - **/flarum/app/extensions** : Flarum extension directory - **/flarum/app/public/assets** : Flarum assets directory -- **/var/log** : Flarum & Nginx & PHP-FPM log directory +- **/var/log/flarum** : Flarum log directory ### Environment variables @@ -58,7 +58,7 @@ | **PHP_MEMORY_LIMIT** | PHP memory limit | *optional* | 128M | | **OPCACHE_MEMORY_LIMIT** | OPcache memory size in megabytes | *optional* | 128 | **LOG_TO_STDOUT** | Enable nginx and php error logs to stdout (abandoned in the future)| *optional* | false -| **LOG_OUTOUT** | Set nginx and php log output (value: file/stdio) | *optional* | file +| **LOG_OUTOUT** | Set nginx and php-fpm log output (value: file/stdio) | *optional* | file | **GITHUB_TOKEN_AUTH** | Github token to download private extensions | *optional* | false | **PHP_EXTENSIONS** | Install additional php extensions | *optional* | none @@ -97,7 +97,7 @@ services: volumes: - /mnt/docker/flarum/assets:/flarum/app/public/assets - /mnt/docker/flarum/extensions:/flarum/app/extensions - - /mnt/docker/flarum/log:/var/log + - /mnt/docker/flarum/log:/var/log/flarum - /mnt/docker/flarum/nginx:/etc/nginx/flarum ports: - 80:8888 @@ -171,7 +171,7 @@ services: volumes: - /mnt/docker/flarum/assets:/flarum/app/public/assets - /mnt/docker/flarum/extensions:/flarum/app/extensions - - /mnt/docker/flarum/log:/var/log + - /mnt/docker/flarum/log:/var/log/flarum - /mnt/docker/flarum/nginx:/etc/nginx/flarum ```