diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-05-28 18:03:34 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-05-28 18:03:34 +0200 |
| commit | 0292b2f1f3a8cba3179467bba6c6af6bd0e97453 (patch) | |
| tree | 65f2b10459c6046bc74556298a90d93187e80f1e /Docker | |
| parent | eeefbdf9c720790b83cc82fd981929bf4d699120 (diff) | |
Improve Dev Container (#5423)
* Improve Dev Container
PHPStan was failing in Dev Container
* Update Docker to Alpine Linux 3.18
* New DATA_PATH environment variable
* README
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-Newest | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 1 | ||||
| -rw-r--r-- | Docker/README.md | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 08e6dce43..211df9aaa 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -52,6 +52,7 @@ RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.co ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' +ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 68e25faa8..6aa1d7359 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -50,6 +50,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' +ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index 37783494b..bee845771 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -52,6 +52,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' +ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest index ede1ba643..11dd34a65 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -52,6 +52,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' +ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 892cbc955..b878399ac 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -64,6 +64,7 @@ RUN rm /usr/bin/qemu-* /var/www/FreshRSS/Docker/qemu-* ENV COPY_LOG_TO_SYSLOG On ENV COPY_SYSLOG_TO_STDERR On ENV CRON_MIN '' +ENV DATA_PATH '' ENV FRESHRSS_ENV '' ENV LISTEN '' diff --git a/Docker/README.md b/Docker/README.md index 42085f38a..0e8b16c55 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -83,6 +83,7 @@ and with newer packages in general (Apache, PHP). * `TZ`: (default is `UTC`) A [server timezone](http://php.net/timezones) * `CRON_MIN`: (default is disabled) Define minutes for the built-in cron job to automatically refresh feeds (see below for more advanced options) +* `DATA_PATH`: (default is empty, defined by `./constants.local.php` or `./constants.php`) Defines the path for writeable data. * `FRESHRSS_ENV`: (default is `production`) Enables additional development information if set to `development` (increases the level of logging and ensures that errors are displayed) (see below for more development options) * `COPY_LOG_TO_SYSLOG`: (default is `On`) Copy all the logs to syslog * `COPY_SYSLOG_TO_STDERR`: (default is `On`) Copy syslog to Standard Error so that it is visible in docker logs |