From 1f1f9e10475a0e49b4a6c7daedf3a5b22224599b Mon Sep 17 00:00:00 2001 From: moustillon Date: Mon, 15 Jun 2026 11:00:20 +0200 Subject: [PATCH] feat: setup the environment for dev to launch everything in a single docker compose --- docker-compose.dev.yml | 3 ++- frontend/Dockerfile | 6 +++--- frontend/src/index.ts | 10 +++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c6d5f6a..7c88bae 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -33,7 +33,7 @@ services: backend: build: ./backend container_name: gcc-backend - command: sh -c "bunx prisma migrate deploy && bun --hot src/index.ts" + command: sh -c "bunx prisma generate && bunx prisma migrate deploy && bun --hot src/index.ts" ports: - "8080:8080" environment: @@ -69,6 +69,7 @@ services: - "3000:6767" environment: API_URL: http://localhost:8080 + PUBLIC_URL: http://localhost:3000 volumes: - ./frontend/src:/app/src depends_on: diff --git a/frontend/Dockerfile b/frontend/Dockerfile index cee91aa..40073c2 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -13,10 +13,10 @@ RUN bun install COPY . . # Expose le port du frontend -EXPOSE 3000 +EXPOSE 6767 -# Lance le serveur de dev -CMD ["bun", "run", "dev", "--host", "0.0.0.0"] +# Lance le serveur de dev avec hot reload (src/index.ts écoute sur PORT ?? 6767) +CMD ["bun", "--hot", "src/index.ts"] diff --git a/frontend/src/index.ts b/frontend/src/index.ts index 8cb11ee..10c6380 100644 --- a/frontend/src/index.ts +++ b/frontend/src/index.ts @@ -12,4 +12,12 @@ const server = serve({ }, }); -console.log(`Server running at ${server.url}`); +const publicUrl = process.env.PUBLIC_URL ?? server.url.toString(); +console.log(` +┌─────────────────────────────────────────┐ +│ GCC — Dev Environment │ +├─────────────────────────────────────────┤ +│ Frontend → ${publicUrl.padEnd(25)}│ +│ Backend → http://localhost:8080 │ +└─────────────────────────────────────────┘ +`);