From 7e09ae1f98962fdc1cca7d307cd70d83299ea4ab Mon Sep 17 00:00:00 2001 From: Elias Schneider Date: Tue, 24 Dec 2024 16:06:59 +0100 Subject: [PATCH] chore: change location of Caddyfiles --- Dockerfile | 2 +- reverse-proxy/Caddyfile | 8 ++++---- reverse-proxy/Caddyfile.trust-proxy | 21 +++++++++------------ scripts/docker/entrypoint.sh | 4 ++-- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3cdafa9e..f177e911 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ COPY --from=backend-builder /opt/app/package.json ./ WORKDIR /opt/app -COPY ./reverse-proxy /etc/caddy +COPY ./reverse-proxy /opt/app/reverse-proxy COPY ./scripts ./scripts EXPOSE 3000 diff --git a/reverse-proxy/Caddyfile b/reverse-proxy/Caddyfile index 66746bc9..c92f9f93 100644 --- a/reverse-proxy/Caddyfile +++ b/reverse-proxy/Caddyfile @@ -1,7 +1,7 @@ :3000 { - # Reverse proxy for /api - reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} + # Reverse proxy for /api + reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} - # Reverse proxy for all other requests - reverse_proxy http://localhost:{$PORT:3333} + # Reverse proxy for all other requests + reverse_proxy http://localhost:{$PORT:3333} } diff --git a/reverse-proxy/Caddyfile.trust-proxy b/reverse-proxy/Caddyfile.trust-proxy index 32b23590..2bfd198b 100644 --- a/reverse-proxy/Caddyfile.trust-proxy +++ b/reverse-proxy/Caddyfile.trust-proxy @@ -1,14 +1,11 @@ :3000 { - reverse_proxy /* http://localhost:{$PORT:3333} { - trusted_proxies 0.0.0.0/0 - } + # Reverse proxy for /api + reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} { + trusted_proxies 0.0.0.0/0 + } - reverse_proxy /api/* http://localhost:{$BACKEND_PORT:8080} { - trusted_proxies 0.0.0.0/0 - } - - log { - output file /var/log/caddy/access.log - level WARN - } -} \ No newline at end of file + # Reverse proxy for all other requests + reverse_proxy /* http://localhost:{$PORT:3333} { + trusted_proxies 0.0.0.0/0 + } +} diff --git a/scripts/docker/entrypoint.sh b/scripts/docker/entrypoint.sh index 652e987e..b2b5c543 100644 --- a/scripts/docker/entrypoint.sh +++ b/scripts/docker/entrypoint.sh @@ -5,9 +5,9 @@ cp -rn /tmp/img/* /opt/app/frontend/public/img # Start Caddy if [ "$TRUST_PROXY" = "true" ]; then - caddy start --adapter caddyfile --config /etc/caddy/Caddyfile.trust-proxy & + caddy start --adapter caddyfile --config /opt/app/reverse-proxy/Caddyfile.trust-proxy & else - caddy start --adapter caddyfile --config /etc/caddy/Caddyfile & + caddy start --adapter caddyfile --config /opt/app/reverse-proxy/Caddyfile & fi # Run the frontend server