diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-06-14 15:18:26 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-06-14 15:18:26 +0200 |
| commit | 644427b9b1a0cf525b84f4a2aac2d6a5a2f55045 (patch) | |
| tree | 69131c035dc2e48758da83bb3b2fb63b5b82bf29 | |
| parent | dd5a02106184e72e42c06a139793088ee955fb00 (diff) | |
Docker quiet Apache a2enmod (#5464)
Quiet output for a2enmod, a2dismod, a2disconf, a2dissite, a2ensite to avoid many messages the following, which are not even relevant because Apache is not yet started at this stage:
```
To activate the new configuration, you need to run:
systemctl restart apache2
```
Related to https://github.com/FreshRSS/FreshRSS/pull/5463
| -rw-r--r-- | Docker/Dockerfile | 12 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 12 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index cb35cfa60..4b6979993 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -35,12 +35,12 @@ LABEL \ org.opencontainers.image.vendor="FreshRSS" \ org.opencontainers.image.version="$FRESHRSS_VERSION" -RUN a2dismod -f alias autoindex negotiation status && \ - a2dismod auth_openidc && \ - a2enmod deflate expires headers mime remoteip setenvif && \ - a2disconf '*' && \ - a2dissite '*' && \ - a2ensite 'FreshRSS*' +RUN a2dismod -q -f alias autoindex negotiation status && \ + a2dismod -q auth_openidc && \ + a2enmod -q deflate expires 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*Listen /s/^/#/" /etc/apache2/ports.conf && \ diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 27e55bf9a..58459cf37 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -41,12 +41,12 @@ LABEL \ org.opencontainers.image.vendor="FreshRSS" \ org.opencontainers.image.version="$FRESHRSS_VERSION" -RUN a2dismod -f alias autoindex negotiation status && \ - a2dismod auth_openidc && \ - a2enmod deflate expires headers mime remoteip setenvif && \ - a2disconf '*' && \ - a2dissite '*' && \ - a2ensite 'FreshRSS*' +RUN a2dismod -q -f alias autoindex negotiation status && \ + a2dismod -q auth_openidc && \ + a2enmod -q deflate expires 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*Listen /s/^/#/" /etc/apache2/ports.conf && \ diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index 6420ca219..18fc88f92 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -12,7 +12,7 @@ if [ -n "$LISTEN" ]; then fi if [ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ]; then - a2enmod auth_openidc + a2enmod -q auth_openidc fi if [ -n "$CRON_MIN" ]; then |