feat: use bash expansion instead of test conditions for variables

Author: tboerger

README.md

@@ -23,42 +23,23 @@ For the available versions please look at [Docker Hub][dockerhub] or
 
 ```console
 CADDY_ADAPTER = caddyfile
-CADDY_AGREE = false
-CADDY_CA =
-CADDY_CA_TIMEOUT =
 CADDY_CONFIG = /etc/caddy/caddyfile
-CADDY_CPU =
-CADDY_DEFAULT_SNI =
-CADDY_DISABLE_ALPN_CHALLENGE =
-CADDY_DISABLE_HTTP_CHALLENGE =
-CADDY_DISABLE_METRICS =
 CADDY_DROP_INDEX_FILE = false
-CADDY_EMAIL =
-CADDY_ENV =
 CADDY_ENVFILE =
 CADDY_ENVIRON = false
-CADDY_GRACE =
 CADDY_HEALTHCHECK_CODE = 200
 CADDY_HEALTHCHECK_URL = http://localhost:8080/
-CADDY_HOST =
-CADDY_HTTP_PORT =
-CADDY_HTTP2 =
-CADDY_HTTPS_PORT =
-CADDY_LOG =
-CADDY_LOG_ROLL_COMPRESS =
-CADDY_LOG_ROLL_MB =
 CADDY_PIDFILE =
 CADDY_PINGBACK =
-CADDY_PORT =
-CADDY_QUIC =
-CADDY_QUIET =
 CADDY_RESUME = false
 CADDY_SKIP_CHOWN = false
 CADDY_SKIP_TEMPLATES = false
 CADDY_WATCH = false
 CADDY_WEBROOT = /srv/www
 ```
 
+Extracted by the command: `grep -hE ': "\$\{(.*)\}"' latest/overlay/etc/entrypoint.d/*.sh | sed 's/: "\${//' | sed 's/:="/ = /' | sed 's/"}"$//' | sort | uniq`
+
 ## Inherited environment variables
 
 *  [webhippie/alpine](https://github.com/dockhippie/alpine#available-environment-variables)

latest/Dockerfile.amd64

@@ -35,3 +35,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

latest/Dockerfile.arm

@@ -35,3 +35,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

latest/Dockerfile.arm64

@@ -35,3 +35,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

latest/overlay/etc/entrypoint.d/00-user.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
 declare -x PUID
-[[ -z "${PUID}" ]] && PUID="1000"
+: "${PUID:="1000"}"
 
 declare -x PGID
-[[ -z "${PGID}" ]] && PGID="1000"
-
-true
+: "${PGID:="1000"}"

latest/overlay/etc/entrypoint.d/05-caddy.sh

@@ -1,48 +1,46 @@
 #!/usr/bin/env bash
 
 declare -x CADDY_ADAPTER
-[[ -z "${CADDY_ADAPTER}" ]] && CADDY_ADAPTER="caddyfile"
+: "${CADDY_ADAPTER:="caddyfile"}"
 
 declare -x CADDY_CONFIG
-[[ -z "${CADDY_CONFIG}" ]] && CADDY_CONFIG="/etc/caddy/caddyfile"
+: "${CADDY_CONFIG:="/etc/caddy/caddyfile"}"
 
 declare -x CADDY_ENVFILE
-[[ -z "${CADDY_ENVFILE}" ]] && CADDY_ENVFILE=""
+: "${CADDY_ENVFILE:=""}"
 
 declare -x CADDY_ENVIRON
-[[ -z "${CADDY_ENVIRON}" ]] && CADDY_ENVIRON="false"
+: "${CADDY_ENVIRON:="false"}"
 
 declare -x CADDY_PIDFILE
-[[ -z "${CADDY_PIDFILE}" ]] && CADDY_PIDFILE=""
+: "${CADDY_PIDFILE:=""}"
 
 declare -x CADDY_PINGBACK
-[[ -z "${CADDY_PINGBACK}" ]] && CADDY_PINGBACK=""
+: "${CADDY_PINGBACK:=""}"
 
 declare -x CADDY_PINGBACK
-[[ -z "${CADDY_PINGBACK}" ]] && CADDY_PINGBACK=""
+: "${CADDY_PINGBACK:=""}"
 
 declare -x CADDY_RESUME
-[[ -z "${CADDY_RESUME}" ]] && CADDY_RESUME="false"
+: "${CADDY_RESUME:="false"}"
 
 declare -x CADDY_WATCH
-[[ -z "${CADDY_WATCH}" ]] && CADDY_WATCH="false"
+: "${CADDY_WATCH:="false"}"
 
 declare -x CADDY_WEBROOT
-[[ -z "${CADDY_WEBROOT}" ]] && CADDY_WEBROOT="/srv/www"
+: "${CADDY_WEBROOT:="/srv/www"}"
 
 declare -x CADDY_SKIP_TEMPLATES
-[[ -z "${CADDY_SKIP_TEMPLATES}" ]] && CADDY_SKIP_TEMPLATES="false"
+: "${CADDY_SKIP_TEMPLATES:="false"}"
 
 declare -x CADDY_SKIP_CHOWN
-[[ -z "${CADDY_SKIP_CHOWN}" ]] && CADDY_SKIP_CHOWN="false"
+: "${CADDY_SKIP_CHOWN:="false"}"
 
 declare -x CADDY_HEALTHCHECK_URL
-[[ -z "${CADDY_HEALTHCHECK_URL}" ]] && CADDY_HEALTHCHECK_URL="http://localhost:8080/"
+: "${CADDY_HEALTHCHECK_URL:="http://localhost:8080/"}"
 
 declare -x CADDY_HEALTHCHECK_CODE
-[[ -z "${CADDY_HEALTHCHECK_CODE}" ]] && CADDY_HEALTHCHECK_CODE="200"
+: "${CADDY_HEALTHCHECK_CODE:="200"}"
 
 declare -x CADDY_DROP_INDEX_FILE
-[[ -z "${CADDY_DROP_INDEX_FILE}" ]] && CADDY_DROP_INDEX_FILE="false"
-
-true
+: "${CADDY_DROP_INDEX_FILE:="false"}"

v2.10/Dockerfile.amd64

@@ -38,3 +38,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

v2.10/Dockerfile.arm

@@ -38,3 +38,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

v2.10/Dockerfile.arm64

@@ -38,3 +38,7 @@ RUN apk update && \
 
 COPY --from=build /srv/app/caddy /usr/sbin/caddy
 COPY ./overlay /
+
+RUN find /etc/container.d /etc/entrypoint.d -type f -name \*.sh -exec sed -i 's/\r$//' {} +; \
+  sed -i 's/\r$//' /usr/bin/healthcheck /usr/bin/container && \
+  chmod +x /usr/bin/healthcheck /usr/bin/container /etc/container.d/*.sh /etc/entrypoint.d/*.sh

v2.10/overlay/etc/entrypoint.d/00-user.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
 declare -x PUID
-[[ -z "${PUID}" ]] && PUID="1000"
+: "${PUID:="1000"}"
 
 declare -x PGID
-[[ -z "${PGID}" ]] && PGID="1000"
-
-true
+: "${PGID:="1000"}"