diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-12-12 22:07:19 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-12-12 22:07:19 +0100 |
| commit | b66d4ade4160b0f13efa4fb48a6c27884ad81804 (patch) | |
| tree | ca72ea5bae862b4e845cb73c0d5a2017e1e7d92d /Docker/Dockerfile | |
| parent | 73b37cdebecf52366f0959d4dec0753af69c44f4 (diff) | |
Improve Docker + compatibility Arch (#8299)
* Better comments in our Docker images
* Make `cli/access-permissions.sh` compatible with other Apache groups such as `http` for Linux Arch
* Better `/Docker/entrypoint.sh` supporting various Apache configuration paths (and slightly faster).
* Add test image for Linux Arch (not sure we will keep it)
See
* https://github.com/FreshRSS/FreshRSS/pull/8279#issuecomment-3620674818
Diffstat (limited to 'Docker/Dockerfile')
| -rw-r--r-- | Docker/Dockerfile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 5da0e021a..9e9ae54a0 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -23,7 +23,6 @@ ARG FRESHRSS_VERSION ARG SOURCE_COMMIT LABEL \ - org.opencontainers.image.authors="Alkarex" \ org.opencontainers.image.description="A self-hosted RSS feed aggregator" \ org.opencontainers.image.documentation="https://freshrss.github.io/FreshRSS/" \ org.opencontainers.image.licenses="AGPL-3.0" \ @@ -34,18 +33,23 @@ LABEL \ org.opencontainers.image.vendor="FreshRSS" \ org.opencontainers.image.version="$FRESHRSS_VERSION" -RUN a2dismod -q -f alias autoindex negotiation status && \ +RUN \ + # Disable unwanted Apache modules and configurations + a2dismod -q -f alias autoindex negotiation status && \ a2dismod -q auth_openidc && \ - phpdismod calendar exif ffi ftp gettext mysqli posix readline shmop sockets sysvmsg sysvsem sysvshm xsl && \ - a2enmod -q deflate expires filter headers mime remoteip setenvif && \ a2disconf -q '*' && \ a2dissite -q '*' && \ - a2ensite -q 'FreshRSS*' - -RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.conf && \ + sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.conf && \ sed -r -i "/^\s*Listen /s/^/#/" /etc/apache2/ports.conf && \ - # Disable built-in updates when using Docker, as the full image is supposed to be updated instead. + # Enable required Apache modules + a2enmod -q deflate expires filter headers mime remoteip setenvif && \ + # Enable FreshRSS configuration for Apache + a2ensite -q 'FreshRSS*' && \ + # Disable unwanted PHP modules + phpdismod calendar exif ffi ftp gettext mysqli posix readline shmop sockets sysvmsg sysvsem sysvshm xsl && \ + # Disable built-in FreshRSS updates when using Docker, as the full image is supposed to be updated instead sed -r -i "\\#disable_update#s#^.*#\t'disable_update' => true,#" ./config.default.php && \ + # Configure cron job touch /var/www/FreshRSS/Docker/env.txt && \ echo "7,37 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su www-data -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ |