Browse Source

chore: change location of Caddyfiles

Elias Schneider 1 year ago
parent
commit
7e09ae1f98
4 changed files with 16 additions and 19 deletions
  1. 1 1
      Dockerfile
  2. 4 4
      reverse-proxy/Caddyfile
  3. 9 12
      reverse-proxy/Caddyfile.trust-proxy
  4. 2 2
      scripts/docker/entrypoint.sh

+ 1 - 1
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

+ 4 - 4
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}
 }

+ 9 - 12
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
-    }
-}
+	# Reverse proxy for all other requests
+	reverse_proxy /* http://localhost:{$PORT:3333} {
+		trusted_proxies 0.0.0.0/0
+	}
+}

+ 2 - 2
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