From 77a2d5f825719962f9fd42c710b4605c29962b2f Mon Sep 17 00:00:00 2001
From: Ludovic Mermod <ludovic.mermod@epfl.ch>
Date: Thu, 10 Aug 2023 12:09:30 +0200
Subject: [PATCH] build: move reverse proxying on port 80

---
 .devcontainer/docker-compose.yaml | 5 +----
 caddy/Caddyfile.dev               | 2 +-
 strapi/config/server.ts           | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml
index 85447ca..45f72ec 100644
--- a/.devcontainer/docker-compose.yaml
+++ b/.devcontainer/docker-compose.yaml
@@ -27,9 +27,6 @@ services:
       - type: bind
         source: ../strapi
         target: /app
-    ports:
-      # Expose strapi to port 8001
-      - "8001:8001"
     depends_on:
       - strapi-postgres
 
@@ -65,7 +62,7 @@ services:
     volumes:
       - "../caddy/Caddyfile.dev:/etc/caddy/Caddyfile"
     ports:
-      - "3000:3000"
+      - "80:80"
 
 volumes:
   # Persist strapi database
diff --git a/caddy/Caddyfile.dev b/caddy/Caddyfile.dev
index 4446c76..995e486 100644
--- a/caddy/Caddyfile.dev
+++ b/caddy/Caddyfile.dev
@@ -2,7 +2,7 @@
 	auto_https off
 }
 
-http://localhost:3000 {
+http://localhost:80 {
 	handle_path /strapi* {
 		reverse_proxy http://strapi:8001
 	}
diff --git a/strapi/config/server.ts b/strapi/config/server.ts
index 16baec1..871c114 100644
--- a/strapi/config/server.ts
+++ b/strapi/config/server.ts
@@ -4,5 +4,5 @@ export default ({ env }) => ({
   app: {
     keys: env.array("APP_KEYS"),
   },
-  url: env("URL", "http://localhost:3000/strapi"),
+  url: env("URL", "http://localhost/strapi"),
 });