Revert and change quotes

Alkarex · Alkarex · commit c8f3ec86b618 · 2025-08-27T13:57:09.000+02:00
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -63,6 +63,7 @@ ENV TRUSTED_PROXY=''
 ENTRYPOINT ["./Docker/entrypoint.sh"]
 
 EXPOSE 80
-
 # hadolint ignore=DL3025
-CMD sh -c '([ -z "$CRON_MIN" ] || cron) && . /etc/apache2/envvars && if [ "${OIDC_ENABLED:-0}" -ne 0 ]; then exec apache2 -D FOREGROUND -D OIDC_ENABLED; else exec apache2 -D FOREGROUND; fi'
+CMD ([ -z "$CRON_MIN" ] || cron) && \
+	. /etc/apache2/envvars && \
+	exec apache2 -D FOREGROUND $([ "${OIDC_ENABLED:-0}" -ne 0 ] && echo "-D OIDC_ENABLED")
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine
@@ -59,6 +59,6 @@ ENV TRUSTED_PROXY=''
 ENTRYPOINT ["./Docker/entrypoint.sh"]
 
 EXPOSE 80
-
 # hadolint ignore=DL3025
-CMD sh -c '([ -z "$CRON_MIN" ] || crond -d 6) && if [ "${OIDC_ENABLED:-0}" -ne 0 ]; then exec httpd -D FOREGROUND -D OIDC_ENABLED; else exec httpd -D FOREGROUND; fi'
+CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \
+	exec httpd -D FOREGROUND $([ "${OIDC_ENABLED:-0}" -ne 0 ] && echo "-D OIDC_ENABLED")
diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest
@@ -62,6 +62,6 @@ ENV TRUSTED_PROXY=''
 ENTRYPOINT ["./Docker/entrypoint.sh"]
 
 EXPOSE 80
-
 # hadolint ignore=DL3025
-CMD sh -c '([ -z "$CRON_MIN" ] || crond -d 6) && if [ "${OIDC_ENABLED:-0}" -ne 0 ]; then exec httpd -D FOREGROUND -D OIDC_ENABLED; else exec httpd -D FOREGROUND; fi'
+CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \
+	exec httpd -D FOREGROUND $([ "${OIDC_ENABLED:-0}" -ne 0 ] && echo "-D OIDC_ENABLED")
diff --git a/Docker/Dockerfile-Oldest b/Docker/Dockerfile-Oldest
@@ -60,6 +60,6 @@ ENV TRUSTED_PROXY=''
 ENTRYPOINT ["./Docker/entrypoint.sh"]
 
 EXPOSE 80
-
 # hadolint ignore=DL3025
-CMD sh -c '([ -z "$CRON_MIN" ] || crond -d 6) && if [ "${OIDC_ENABLED:-0}" -ne 0 ]; then exec httpd -D FOREGROUND -D OIDC_ENABLED; else exec httpd -D FOREGROUND; fi'
+CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \
+	exec httpd -D FOREGROUND $([ "${OIDC_ENABLED:-0}" -ne 0 ] && echo "-D OIDC_ENABLED")
