diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 0f52c54..1679101 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -45,7 +45,14 @@ jobs: # ---------- Frontend ---------- - name: Build Frontend (${{ env.TAG }}) run: | + if [ "$TAG" = "dev" ]; then + API_URL="http://t610:5005/api" + else + API_URL="http://t610:5004/api" + fi + docker build \ + --build-arg VITE_API_URL=$API_URL \ -t $REGISTRY/hospitality-frontend:${TAG} \ -f src/hospitality-web/Dockerfile \ src/hospitality-web diff --git a/src/hospitality-web/Dockerfile b/src/hospitality-web/Dockerfile index 8c88191..1b2b467 100644 --- a/src/hospitality-web/Dockerfile +++ b/src/hospitality-web/Dockerfile @@ -9,6 +9,9 @@ RUN npm ci # Kopier resten av koden COPY . . +ARG VITE_API_URL +ENV VITE_API_URL=$VITE_API_URL + # Bygg for produksjon RUN npm run build diff --git a/src/hospitality-web/src/lib/api.ts b/src/hospitality-web/src/lib/api.ts index f17b495..6b4f62a 100644 --- a/src/hospitality-web/src/lib/api.ts +++ b/src/hospitality-web/src/lib/api.ts @@ -1,7 +1,7 @@ import axios from 'axios'; import type { LoginRequest, LoginResponse, UserInfo } from '../types/auth'; -const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:5163/api'; +const API_BASE_URL = import.meta.env.VITE_API_URL; export const api = axios.create({ baseURL: API_BASE_URL,