From 79bf1c34967efee18f5f07bcd5633c3d911470c4 Mon Sep 17 00:00:00 2001 From: kyy Date: Tue, 16 Jun 2026 15:23:20 +0900 Subject: [PATCH] =?UTF-8?q?orgfront=20URL=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=EC=9D=84=20ORGFRONT=5FURL=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.sample | 1 + devfront/Dockerfile | 2 ++ devfront/src/features/clients/components/TenantAccessPicker.tsx | 1 - devfront/vite.config.ts | 1 + docker/staging_pull_compose.template.yaml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 6b98db23..2200fd2d 100644 --- a/.env.sample +++ b/.env.sample @@ -180,6 +180,7 @@ VITE_OIDC_CLIENT_ID=devfront VITE_OIDC_AUTHORITY=https://sso.hmac.kr/oidc DEVFRONT_URL=http://localhost:5174 DEVFRONT_CALLBACK_URLS=http://localhost:5174/auth/callback,https://sso.hmac.kr/devfront/auth/callback +ORGFRONT_URL=http://localhost:5175 ORGFRONT_CALLBACK_URLS=http://localhost:5175/auth/callback,https://sso.hmac.kr/orgfront/auth/callback VITE_ORGCHART_URL= diff --git a/devfront/Dockerfile b/devfront/Dockerfile index 32d7cdef..6d18bdcd 100644 --- a/devfront/Dockerfile +++ b/devfront/Dockerfile @@ -14,9 +14,11 @@ COPY devfront ./devfront ARG VITE_DEVFRONT_PUBLIC_URL ARG VITE_OIDC_AUTHORITY ARG VITE_OIDC_CLIENT_ID +ARG ORGFRONT_URL ENV VITE_DEVFRONT_PUBLIC_URL=$VITE_DEVFRONT_PUBLIC_URL ENV VITE_OIDC_AUTHORITY=$VITE_OIDC_AUTHORITY ENV VITE_OIDC_CLIENT_ID=$VITE_OIDC_CLIENT_ID +ENV ORGFRONT_URL=$ORGFRONT_URL RUN pnpm install --frozen-lockfile --ignore-scripts diff --git a/devfront/src/features/clients/components/TenantAccessPicker.tsx b/devfront/src/features/clients/components/TenantAccessPicker.tsx index c5d90e8f..a71f2c74 100644 --- a/devfront/src/features/clients/components/TenantAccessPicker.tsx +++ b/devfront/src/features/clients/components/TenantAccessPicker.tsx @@ -17,7 +17,6 @@ type TenantAccessPickerProps = { function resolveOrgFrontBaseUrl() { return ( - import.meta.env.VITE_ORGFRONT_PUBLIC_URL || import.meta.env.ORGFRONT_URL || "http://localhost:5175" ); diff --git a/devfront/vite.config.ts b/devfront/vite.config.ts index ae610f9a..d4c89085 100644 --- a/devfront/vite.config.ts +++ b/devfront/vite.config.ts @@ -17,6 +17,7 @@ const allowedHosts = getAllowedHosts( export default defineConfig( mergeConfig(commonViteConfig, { + envPrefix: ["VITE_", "ORGFRONT_"], cacheDir: process.env.DEVFRONT_VITE_CACHE_DIR ?? "/tmp/baron-sso-devfront-vite-cache", diff --git a/docker/staging_pull_compose.template.yaml b/docker/staging_pull_compose.template.yaml index 31ca94e2..977aa841 100644 --- a/docker/staging_pull_compose.template.yaml +++ b/docker/staging_pull_compose.template.yaml @@ -455,6 +455,7 @@ services: VITE_DEVFRONT_PUBLIC_URL: ${DEVFRONT_URL:-} VITE_OIDC_AUTHORITY: ${VITE_OIDC_AUTHORITY:-} VITE_OIDC_CLIENT_ID: devfront + ORGFRONT_URL: ${ORGFRONT_URL:-} container_name: baron_devfront restart: unless-stopped env_file: