fix: docker compose PORT for local dev

betagouv · Apr 11, 2024 · 64b18b6 · 64b18b6
1 parent 17aaf00
commit 64b18b6
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 42 deletions.
diff --git a/db/1-init.sql b/db/1-init.sql
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -4,39 +4,6 @@ volumes:
   pg_data:
 
 services:
-  frontend: 
-    build: 
-      context: .
-      target: frontend
-    environment:
-      VITE_BACKEND_URL: ${VITE_BACKEND_URL}
-      VITE_ELECTRIC_URL: ${VITE_ELECTRIC_URL}
-    ports: 
-      - "${FRONTEND_PORT}:4173"
-    profiles: 
-      - production
-
-  backend:
-    build:
-      context: .
-      target: backend
-    environment: 
-      PG_HOST: pg
-      PG_PORT: ${PG_PORT}
-      PG_USER: ${PG_USER}
-      PG_PASSWORD: ${PG_PASSWORD}
-      PG_USERS_DB: ${PG_USERS_DB}
-      JWT_SECRET: ${JWT_SECRET}
-      ELECTRIC_SERVICE: http://electric
-      ELECTRIC_PG_PROXY_PORT: ${PG_PROXY_PORT}
-      HTTP_PORT: ${HTTP_PORT}
-    ports:
-      - "${HTTP_PORT}:${HTTP_PORT}"
-    depends_on:
-      - electric
-    profiles: 
-      - production
-
   pg:
     image: postgres:14-alpine
     environment:
@@ -63,7 +30,6 @@ services:
       DATABASE_URL: postgresql://${PG_USER}:${PG_PASSWORD}@pg:${PG_PORT}/${PG_ELECTRIC_DB}
       AUTH_JWT_KEY: ${JWT_SECRET}
       # LOGICAL_PUBLISHER_PORT: 5433
-      # SERVICE: 'http://localhost:5133',
       PG_PROXY_PASSWORD: ${PG_PROXY_PASSWORD}
       PG_PROXY_PORT: ${PG_PROXY_PORT}
       AUTH_MODE: secure

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -31,7 +31,7 @@
     "@tanstack/react-router": "^1.22.2",
     "@tanstack/router-devtools": "^1.22.2",
     "date-fns": "^3.6.0",
-    "electric-sql": "^0.9.5",
+    "electric-sql": "^0.10.0",
     "install": "^0.13.0",
     "npm": "^10.5.0",
     "ofetch": "^1.3.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml