From de5c56fc2c5615f9b71961268df8615b365ed16d Mon Sep 17 00:00:00 2001 From: Harald Reingruber Date: Thu, 14 Jul 2022 12:47:13 +0000 Subject: [PATCH 1/5] Allow to pass Caddyfile via env variable --- 2.5/alpine/Dockerfile | 4 ++++ 2.5/alpine/entrypoint.sh | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100755 2.5/alpine/entrypoint.sh diff --git a/2.5/alpine/Dockerfile b/2.5/alpine/Dockerfile index 2a40073..ad3a2c2 100644 --- a/2.5/alpine/Dockerfile +++ b/2.5/alpine/Dockerfile @@ -56,4 +56,8 @@ EXPOSE 2019 WORKDIR /srv +COPY entrypoint.sh /bin/entrypoint.sh + +ENTRYPOINT [ "entrypoint.sh" ] + CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] diff --git a/2.5/alpine/entrypoint.sh b/2.5/alpine/entrypoint.sh new file mode 100755 index 0000000..5521578 --- /dev/null +++ b/2.5/alpine/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# Check if Caddyfile config is passed via $CADDYFILE +if [[ "$CADDYFILE" ]]; then + echo 'Storing $CADDYFILE variable to /etc/caddy/Caddyfile' + echo -e $CADDYFILE > /etc/caddy/Caddyfile +fi + +# Running passed command +if [[ "$1" ]]; then + eval "$@" +fi \ No newline at end of file From 8b430807a9d386a32b1214ab1ac751e9f47d7343 Mon Sep 17 00:00:00 2001 From: Harald Reingruber Date: Thu, 14 Jul 2022 14:04:42 +0000 Subject: [PATCH 2/5] Change generated Caddyfile path to current working directory --- 2.5/alpine/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.5/alpine/entrypoint.sh b/2.5/alpine/entrypoint.sh index 5521578..361c709 100755 --- a/2.5/alpine/entrypoint.sh +++ b/2.5/alpine/entrypoint.sh @@ -2,8 +2,8 @@ # Check if Caddyfile config is passed via $CADDYFILE if [[ "$CADDYFILE" ]]; then - echo 'Storing $CADDYFILE variable to /etc/caddy/Caddyfile' - echo -e $CADDYFILE > /etc/caddy/Caddyfile + echo 'Storing $CADDYFILE variable to ./Caddyfile' + echo -e $CADDYFILE > Caddyfile fi # Running passed command From 1f09ff555fa896d4935272454677db1cb854122a Mon Sep 17 00:00:00 2001 From: Harald Reingruber Date: Thu, 14 Jul 2022 15:11:21 +0000 Subject: [PATCH 3/5] Fix preserving newlines --- 2.5/alpine/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.5/alpine/entrypoint.sh b/2.5/alpine/entrypoint.sh index 361c709..411e55f 100755 --- a/2.5/alpine/entrypoint.sh +++ b/2.5/alpine/entrypoint.sh @@ -3,7 +3,7 @@ # Check if Caddyfile config is passed via $CADDYFILE if [[ "$CADDYFILE" ]]; then echo 'Storing $CADDYFILE variable to ./Caddyfile' - echo -e $CADDYFILE > Caddyfile + printf "$CADDYFILE" > Caddyfile # echo doesn't preserve newlines fi # Running passed command From c403f71cc76620f6d8a992906831fc4953c0ba5e Mon Sep 17 00:00:00 2001 From: Harald Reingruber Date: Thu, 14 Jul 2022 21:26:59 +0000 Subject: [PATCH 4/5] Fix signals not being forwarded to caddy --- 2.5/alpine/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.5/alpine/entrypoint.sh b/2.5/alpine/entrypoint.sh index 411e55f..1b8eadc 100755 --- a/2.5/alpine/entrypoint.sh +++ b/2.5/alpine/entrypoint.sh @@ -8,5 +8,5 @@ fi # Running passed command if [[ "$1" ]]; then - eval "$@" + exec $@ fi \ No newline at end of file From 5ad130b57e2e9652e6345e88634779982e505bec Mon Sep 17 00:00:00 2001 From: Harald Reingruber <74898239+haraldreingruber-dedalus@users.noreply.github.com> Date: Thu, 21 Jul 2022 07:30:16 +0200 Subject: [PATCH 5/5] Add improvement ideas taken from traefik entrypoint.sh --- 2.5/alpine/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/2.5/alpine/entrypoint.sh b/2.5/alpine/entrypoint.sh index 1b8eadc..85e58c2 100755 --- a/2.5/alpine/entrypoint.sh +++ b/2.5/alpine/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e # Check if Caddyfile config is passed via $CADDYFILE if [[ "$CADDYFILE" ]]; then @@ -8,5 +9,5 @@ fi # Running passed command if [[ "$1" ]]; then - exec $@ -fi \ No newline at end of file + exec "$@" +fi