From d398ac83994b78eada6452ac46c60bc8df205e02 Mon Sep 17 00:00:00 2001 From: Christopher Bisset Date: Wed, 27 Jul 2022 16:29:47 +1000 Subject: [PATCH] dockerfile updates --- docker/production/dockerfile | 2 +- docker/production/scripts/2-initialise.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/production/dockerfile b/docker/production/dockerfile index dd5607e..e52f8d4 100644 --- a/docker/production/dockerfile +++ b/docker/production/dockerfile @@ -43,7 +43,7 @@ WORKDIR /staging # Copy across the scripts folder COPY scripts/* ./scripts/ # Copy default caddy config from project root -COPY ../../Caddyfile /staging/Caddyfile +COPY ./Caddyfile /staging/Caddyfile COPY --from=build /staging/${PROJECT_NAME}/build /web RUN apk add --no-cache caddy diff --git a/docker/production/scripts/2-initialise.sh b/docker/production/scripts/2-initialise.sh index c25fc52..710e110 100644 --- a/docker/production/scripts/2-initialise.sh +++ b/docker/production/scripts/2-initialise.sh @@ -2,7 +2,7 @@ #----# # placeholder for testing -while true; do sleep 1; done +# while true; do sleep 1; done #----# # check if /data/Caddyfile exists, copy across if not @@ -13,4 +13,4 @@ then fi echo "Starting Caddy" -/usr/bin/caddy run --adapter caddyfile --config /data/Caddyfile \ No newline at end of file +/usr/sbin/caddy run --adapter caddyfile --config /data/Caddyfile \ No newline at end of file