diff --git a/docker-compose.yml b/docker-compose.yml index 70d6868..d889be9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,6 @@ services: build: ./frontend environment: BACKEND_HOST: ${BACKEND_HOST} - VITE_BACKEND_URL: /backend depends_on: - backend restart: unless-stopped diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 112a4c8..4c4edf5 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -13,9 +13,6 @@ FROM nginx:alpine AS runner WORKDIR /usr/share/nginx/html COPY --from=builder /app/dist . -COPY docker-entrypoint.d/10-runtime-env.sh /docker-entrypoint.d/10-runtime-env.sh -RUN chmod +x /docker-entrypoint.d/10-runtime-env.sh - COPY nginx.conf /etc/nginx/templates/default.conf.template EXPOSE 80 diff --git a/frontend/docker-entrypoint.d/10-runtime-env.sh b/frontend/docker-entrypoint.d/10-runtime-env.sh deleted file mode 100644 index 469d5bb..0000000 --- a/frontend/docker-entrypoint.d/10-runtime-env.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -eu - -VITE_BACKEND_URL_VALUE="${VITE_BACKEND_URL:-/backend}" - -cat > /usr/share/nginx/html/env.js <
- diff --git a/frontend/src/config/api.config.ts b/frontend/src/config/api.config.ts index e19dcf3..8313a7f 100644 --- a/frontend/src/config/api.config.ts +++ b/frontend/src/config/api.config.ts @@ -1,13 +1,4 @@ -type WindowWithEnv = Window & { - __ENV?: { - VITE_BACKEND_URL?: string; - }; -}; - -const runtimeEnv = (globalThis as unknown as WindowWithEnv).__ENV; - export const API_BASE = - runtimeEnv?.VITE_BACKEND_URL || (import.meta as any).env?.VITE_BACKEND_URL || import.meta.env.VITE_BACKEND_URL || - "http://localhost:8004"; + "/backend";