From 5f5ab2b75d0a086ea3dc8dca2b70f7b3a6059e97 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Sun, 9 Mar 2025 16:19:09 +0530 Subject: [PATCH] fix: moving nginx to caddy --- {nginx => proxy}/Dockerfile.dev | 4 +- nginx/Dockerfile => proxy/Dockerfile.nginx | 4 +- proxy/caddy/.prettierignore | 1 + proxy/caddy/Caddyfile | 39 +++++++++++++++++++ {nginx => proxy/nginx}/.prettierignore | 0 {nginx => proxy/nginx}/env.sh | 0 .../nginx}/nginx-single-docker-image.conf | 0 {nginx => proxy/nginx}/nginx.conf.dev | 0 {nginx => proxy/nginx}/nginx.conf.template | 0 9 files changed, 44 insertions(+), 4 deletions(-) rename {nginx => proxy}/Dockerfile.dev (63%) rename nginx/Dockerfile => proxy/Dockerfile.nginx (61%) create mode 100644 proxy/caddy/.prettierignore create mode 100644 proxy/caddy/Caddyfile rename {nginx => proxy/nginx}/.prettierignore (100%) rename {nginx => proxy/nginx}/env.sh (100%) rename {nginx => proxy/nginx}/nginx-single-docker-image.conf (100%) rename {nginx => proxy/nginx}/nginx.conf.dev (100%) rename {nginx => proxy/nginx}/nginx.conf.template (100%) diff --git a/nginx/Dockerfile.dev b/proxy/Dockerfile.dev similarity index 63% rename from nginx/Dockerfile.dev rename to proxy/Dockerfile.dev index 4b90c0dd57..6cc366611e 100644 --- a/nginx/Dockerfile.dev +++ b/proxy/Dockerfile.dev @@ -1,9 +1,9 @@ FROM nginx:1.25.0-alpine RUN rm /etc/nginx/conf.d/default.conf -COPY nginx.conf.dev /etc/nginx/nginx.conf.template +COPY nginx/nginx.conf.dev /etc/nginx/nginx.conf.template -COPY ./env.sh /docker-entrypoint.sh +COPY nginx/env.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh # Update all environment variables diff --git a/nginx/Dockerfile b/proxy/Dockerfile.nginx similarity index 61% rename from nginx/Dockerfile rename to proxy/Dockerfile.nginx index b1aef1a200..148f7fd183 100644 --- a/nginx/Dockerfile +++ b/proxy/Dockerfile.nginx @@ -1,9 +1,9 @@ FROM nginx:1.25.0-alpine RUN rm /etc/nginx/conf.d/default.conf -COPY nginx.conf.template /etc/nginx/nginx.conf.template +COPY nginx/nginx.conf.template /etc/nginx/nginx.conf.template -COPY ./env.sh /docker-entrypoint.sh +COPY nginx/env.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh # Update all environment variables diff --git a/proxy/caddy/.prettierignore b/proxy/caddy/.prettierignore new file mode 100644 index 0000000000..17aecda5c4 --- /dev/null +++ b/proxy/caddy/.prettierignore @@ -0,0 +1 @@ +nginx.conf.template diff --git a/proxy/caddy/Caddyfile b/proxy/caddy/Caddyfile new file mode 100644 index 0000000000..4d24e61e03 --- /dev/null +++ b/proxy/caddy/Caddyfile @@ -0,0 +1,39 @@ +(plane_proxy) { + request_body { + max_size {$FILE_SIZE_LIMIT} + } + + reverse_proxy /spaces/* space:3000 + reverse_proxy /god-mode/* admin:3000 + reverse_proxy /api/* api:8000 + reverse_proxy /auth/* api:8000 + reverse_proxy /live/* live:3000 + reverse_proxy /{$BUCKET_NAME} plane-minio:9000 + reverse_proxy /{$BUCKET_NAME}/* plane-minio:9000 + reverse_proxy /* web:3000 +} + +{ + email {$CERT_EMAIL:admin@example.com} + acme_ca {$CERT_ACME_CA} + {$CERT_ACME_DNS} + servers { + timeouts { + read_body 600s + read_header 30s + write 600s + idle 600s + } + max_header_size 25MB + client_ip_headers X-Forwarded-For X-Real-IP + trusted_proxies static {$TRUSTED_PROXIES:0.0.0.0/0} + } + log { + output {$LOG_OUTPUT:stdout} + level {$LOG_LEVEL:INFO} + } +} + +{$SITE_ADDRESS} { + import plane_proxy +} \ No newline at end of file diff --git a/nginx/.prettierignore b/proxy/nginx/.prettierignore similarity index 100% rename from nginx/.prettierignore rename to proxy/nginx/.prettierignore diff --git a/nginx/env.sh b/proxy/nginx/env.sh similarity index 100% rename from nginx/env.sh rename to proxy/nginx/env.sh diff --git a/nginx/nginx-single-docker-image.conf b/proxy/nginx/nginx-single-docker-image.conf similarity index 100% rename from nginx/nginx-single-docker-image.conf rename to proxy/nginx/nginx-single-docker-image.conf diff --git a/nginx/nginx.conf.dev b/proxy/nginx/nginx.conf.dev similarity index 100% rename from nginx/nginx.conf.dev rename to proxy/nginx/nginx.conf.dev diff --git a/nginx/nginx.conf.template b/proxy/nginx/nginx.conf.template similarity index 100% rename from nginx/nginx.conf.template rename to proxy/nginx/nginx.conf.template