From 827b6b5222b559a836f1589c28c9503420fd34fe Mon Sep 17 00:00:00 2001 From: Felix Zett Date: Sun, 28 Sep 2025 19:26:16 +0200 Subject: [PATCH] fix: use VITE_API_URL for API base path --- docker-compose.prod.yml | 3 ++- docker-compose.yml | 8 ++++---- frontend/Dockerfile | 2 ++ frontend/src/api.ts | 3 +-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 9d2173d..77cf04c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -35,11 +35,12 @@ services: context: ./frontend dockerfile: Dockerfile target: prod + args: + VITE_API_URL: /api expose: - "80" environment: - NODE_ENV=production - - VITE_API_URL=/api command: ["serve", "-s", "dist", "-l", "80"] networks: - nginx-proxy diff --git a/docker-compose.yml b/docker-compose.yml index d4e4475..86c32ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ services: - db: + packlist-db: image: postgres:15-alpine environment: POSTGRES_PASSWORD: postgres @@ -9,13 +9,13 @@ services: - "5432:5432" volumes: - db_data:/var/lib/postgresql/data - backend: + packlist-backend: build: context: ./backend dockerfile: Dockerfile target: dev depends_on: - - db + - packlist-db ports: - "8000:8000" - "5678:5678" # Port für Debugger @@ -24,7 +24,7 @@ services: environment: - PYTHONUNBUFFERED=1 command: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"] - frontend: + packlist-frontend: build: context: ./frontend dockerfile: Dockerfile diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6e52ffe..ce2bb7c 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -3,6 +3,8 @@ WORKDIR /app COPY package*.json ./ RUN npm install COPY . . +ARG VITE_API_URL +ENV VITE_API_URL=$VITE_API_URL RUN npm run build FROM node:20-alpine AS prod diff --git a/frontend/src/api.ts b/frontend/src/api.ts index 608c475..02f89ad 100644 --- a/frontend/src/api.ts +++ b/frontend/src/api.ts @@ -11,8 +11,7 @@ export interface Item { trip_id: string; } -// TODO use VITE_API_URL from compose instead of "/api" -export const API_BASE = "/api"; +export const API_BASE = import.meta.env.VITE_API_URL || "http://localhost:8000"; export async function getSeed() { return fetch(`${API_BASE}/dev/seed`).then(res => res.json());