diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-08-27 14:34:24 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-08-27 14:34:24 +0200 |
| commit | 6c64e7b07b915a49141f47fdc4890222164e2de2 (patch) | |
| tree | 7afe261dda165949e8482212f68fd51598966038 /Docker | |
| parent | 1481cf51f74330f2e76ed10de11bc2d80a6c95d4 (diff) | |
Docker CMD compatibility (#7861)
Some caller systems do not seem escape the CMD quotes correctly.
fix https://github.com/FreshRSS/FreshRSS/issues/7859#issuecomment-3225691432
fix https://github.com/FreshRSS/FreshRSS/discussions/5611
fix https://github.com/FreshRSS/FreshRSS/discussions/7267
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Newest | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Oldest | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index f2d1813af..ab37b33a5 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -66,4 +66,4 @@ EXPOSE 80 # hadolint ignore=DL3025 CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ - exec apache2 -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo '-D OIDC_ENABLED') + exec apache2 -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo "-D OIDC_ENABLED") diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 33eb28c93..7546b35da 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -61,4 +61,4 @@ ENTRYPOINT ["./Docker/entrypoint.sh"] EXPOSE 80 # hadolint ignore=DL3025 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ - exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo '-D OIDC_ENABLED') + exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo "-D OIDC_ENABLED") diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest index 470e66733..cb959cf5b 100644 --- a/Docker/Dockerfile-Newest +++ b/Docker/Dockerfile-Newest @@ -64,4 +64,4 @@ ENTRYPOINT ["./Docker/entrypoint.sh"] EXPOSE 80 # hadolint ignore=DL3025 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ - exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo '-D OIDC_ENABLED') + exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo "-D OIDC_ENABLED") diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest index e31c75f20..f827adcaf 100644 --- a/Docker/Dockerfile-Oldest +++ b/Docker/Dockerfile-Oldest @@ -62,4 +62,4 @@ ENTRYPOINT ["./Docker/entrypoint.sh"] EXPOSE 80 # hadolint ignore=DL3025 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ - exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo '-D OIDC_ENABLED') + exec httpd -D FOREGROUND $([ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ] && echo "-D OIDC_ENABLED") |