From b66d4ade4160b0f13efa4fb48a6c27884ad81804 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 12 Dec 2025 22:07:19 +0100 Subject: 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 --- .devcontainer/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to '.devcontainer/Dockerfile') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3db323983..31abb1c5a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,13 +11,16 @@ RUN apk add --no-cache \ php-pdo_sqlite php-pdo_mysql php-pdo_pgsql \ bash composer curl docker-cli-buildx git gpg make nodejs npm shellcheck shfmt sudo -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 RUN adduser --ingroup www-data --disabled-password developer && \ -- cgit v1.2.3