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 /.devcontainer | |
| 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 '.devcontainer')
| -rw-r--r-- | .devcontainer/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
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 && \ |