Skip to content

Commit

Permalink
Docker quiet Apache a2enmod (#5464)
Browse files Browse the repository at this point in the history
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 #5463
  • Loading branch information
Alkarex committed Jun 14, 2023
1 parent dd5a021 commit 644427b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions Docker/Dockerfile
Expand Up @@ -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 && \
Expand Down
12 changes: 6 additions & 6 deletions Docker/Dockerfile-QEMU-ARM
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion Docker/entrypoint.sh
Expand Up @@ -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
Expand Down

0 comments on commit 644427b

Please sign in to comment.