From fa0bf07ad2bba2be0f5cd6d1aef838273d584cd9 Mon Sep 17 00:00:00 2001 From: mono Date: Sun, 15 Mar 2026 22:53:42 -0500 Subject: [PATCH] fix: add ARG and ENV to Dockerfile for build args, fix typo in .env.staging --- deploy/.env.production | 2 ++ deploy/.env.staging | 2 ++ deploy/Dockerfile | 8 +++++++- deploy/build.sh | 1 - deploy/nginx.conf | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 deploy/.env.production create mode 100644 deploy/.env.staging diff --git a/deploy/.env.production b/deploy/.env.production new file mode 100644 index 0000000..db36cce --- /dev/null +++ b/deploy/.env.production @@ -0,0 +1,2 @@ +VITE_API_IMPLEMENTATION=django +VITE_DJANGO_BASE_URL=http://donconfiao.sabatron.click:7000 diff --git a/deploy/.env.staging b/deploy/.env.staging new file mode 100644 index 0000000..f794e52 --- /dev/null +++ b/deploy/.env.staging @@ -0,0 +1,2 @@ +VITE_API_IMPLEMENTATION=django +VITE_DJANGO_BASE_URL=http://staging.api.donconfiao.sabatron.click:7000 diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 9781939..49ab439 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,6 +1,12 @@ # Stage 1: Build with Node.js FROM node:20-alpine AS builder +ARG VITE_DJANGO_BASE_URL +ARG VITE_API_IMPLEMENTATION + +ENV VITE_DJANGO_BASE_URL=$VITE_DJANGO_BASE_URL +ENV VITE_API_IMPLEMENTATION=$VITE_API_IMPLEMENTATION + WORKDIR /app COPY package.json package-lock.json ./ @@ -13,7 +19,7 @@ RUN npm run build FROM nginx:alpine COPY --from=builder /app/dist /usr/share/nginx/html -COPY nginx.conf /etc/nginx/conf.d/default.conf +COPY deploy/nginx.conf /etc/nginx/conf.d/default.conf EXPOSE 80 diff --git a/deploy/build.sh b/deploy/build.sh index beb00fa..79d5ebf 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -7,7 +7,6 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" GITEA_REGISTRY="gitea.onecluster.org" GITEA_USER="mono" -IMAGE_NAME="don_confiao_frontend" usage() { echo "Usage: $0 [commit_sha]" diff --git a/deploy/nginx.conf b/deploy/nginx.conf index 9cd3194..5d4a6b7 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name localhost; + server_name _; root /usr/share/nginx/html; index index.html;