From 2cafd7afac0604906f2e1f635ab7deb6bfb5a7f1 Mon Sep 17 00:00:00 2001 From: adjoly Date: Thu, 16 Oct 2025 13:25:36 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20added=20e?= =?UTF-8?q?nv=20variable=20to=20front?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/api-base/compose.yml | 2 +- docker/front/Dockerfile | 7 +++++-- docker/front/compose.yml | 3 +++ src/utils/authUserCreate.js | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/api-base/compose.yml b/docker/api-base/compose.yml index 76b987e..85b77c4 100644 --- a/docker/api-base/compose.yml +++ b/docker/api-base/compose.yml @@ -29,7 +29,7 @@ services: - back environment: - TZ=Europe/Paris - - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL} + - GOOGLE_CALLBACK_URL=${AUTH_URL} - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID} - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET} - API_TARGET=auth diff --git a/docker/front/Dockerfile b/docker/front/Dockerfile index b8f2ce2..36fc0e5 100644 --- a/docker/front/Dockerfile +++ b/docker/front/Dockerfile @@ -13,6 +13,9 @@ RUN cd /build \ FROM node:lts-alpine AS builder-vite +ARG VITE_USER_URL +ARG VITE_AUTH_URL + RUN npm install -g pnpm WORKDIR /app @@ -24,8 +27,8 @@ RUN pnpm install --frozen-lockfile COPY vite.config.js tailwind.config.js ./ COPY src ./src -RUN pnpm vite build - +RUN VITE_USER_URL=${VITE_USER_URL} VITE_AUTH_URL=${VITE_AUTH_URL}\ + pnpm vite build FROM alpine:3.22 diff --git a/docker/front/compose.yml b/docker/front/compose.yml index 72b2b67..134b29d 100644 --- a/docker/front/compose.yml +++ b/docker/front/compose.yml @@ -4,6 +4,9 @@ services: build: dockerfile: docker/front/Dockerfile context: ../../ + args: + - VITE_USER_URL=${USER_URL} + - VITE_AUTH_URL=${AUTH_URL} environment: - TZ=Europe/Paris networks: diff --git a/src/utils/authUserCreate.js b/src/utils/authUserCreate.js index a1d6bba..1ee3d38 100644 --- a/src/utils/authUserCreate.js +++ b/src/utils/authUserCreate.js @@ -10,7 +10,7 @@ export async function authUserCreate(username, fastify) { }; const cookie = fastify.jwt.sign({ user: "admin" }); - const url = process.env.USER_URL || "http://localhost:3002/" + const url = process.env.USER_URL + "/" || "http://localhost:3002/" await axios.post( url + "users/" + username,