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-Alpine | |
| 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-Alpine')
| -rw-r--r-- | Docker/Dockerfile-Alpine | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 0307d580e..1c688742f 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -20,7 +20,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" \ @@ -31,17 +30,22 @@ LABEL \ org.opencontainers.image.vendor="FreshRSS" \ org.opencontainers.image.version="$FRESHRSS_VERSION" -RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ +RUN \ + # Disable unwanted Apache modules and configurations + rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ - /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ + # Enable required Apache modules + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|filter|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ + /etc/apache2/httpd.conf && \ + # PHP configuration if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php84 /usr/bin/php; else true; fi && \ - # Disable built-in updates when using Docker, as the full image is supposed to be updated instead. + # 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 "27,57 * * * * . /var/www/FreshRSS/Docker/env.txt; \ su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ |