From d374055aebe0af7c44a2c2809f167c317071a15a Mon Sep 17 00:00:00 2001
From: hamid zarghami <hamidzarghami@hamids-MacBook-Pro.local>
Date: Sat, 30 May 2026 09:52:34 +0330
Subject: [PATCH] update .env and docker file

---
 .env       |  8 ++++----
 Dockerfile | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 2aa0616..f21e947 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-VITE_API_URL = 'http://89.32.249.26:4010'
-# VITE_API_URL = 'http://192.168.99.131:4000'
-VITE_TOKEN_NAME = 'dpage-editor-t'
-VITE_REFRESH_TOKEN_NAME = 'dpage-editor-refresh-t'
\ No newline at end of file
+VITE_API_URL=http://89.32.249.26:4010
+# VITE_API_URL=http://192.168.99.131:4000
+VITE_TOKEN_NAME=dpage-editor-t
+VITE_REFRESH_TOKEN_NAME=dpage-editor-refresh-t
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index f305d25..993fb47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,17 +15,20 @@ RUN cp /usr/share/zoneinfo/Asia/Tehran /etc/localtime && echo "Asia/Tehran" > /e
 
 WORKDIR /build
 
+# Optional build-args (CapRover / docker build --build-arg). When unset, Vite reads .env from COPY.
 ARG VITE_API_URL
-ARG VITE_TOKEN_NAME=dpage-editor-t
-ARG VITE_REFRESH_TOKEN_NAME=dpage-editor-refresh-t
-ENV VITE_API_URL=$VITE_API_URL \
-    VITE_TOKEN_NAME=$VITE_TOKEN_NAME \
-    VITE_REFRESH_TOKEN_NAME=$VITE_REFRESH_TOKEN_NAME
+ARG VITE_TOKEN_NAME
+ARG VITE_REFRESH_TOKEN_NAME
 
 COPY package*.json ./
 RUN npm ci --legacy-peer-deps
 COPY . ./
-RUN npm run build
+RUN set -e; \
+  env_args=""; \
+  [ -n "$VITE_API_URL" ] && env_args="$env_args VITE_API_URL=$VITE_API_URL"; \
+  [ -n "$VITE_TOKEN_NAME" ] && env_args="$env_args VITE_TOKEN_NAME=$VITE_TOKEN_NAME"; \
+  [ -n "$VITE_REFRESH_TOKEN_NAME" ] && env_args="$env_args VITE_REFRESH_TOKEN_NAME=$VITE_REFRESH_TOKEN_NAME"; \
+  eval "env$env_args npm run build"
 
 FROM nginx:stable-alpine AS production-stage