From fa49ed91a874ebd83f1a313d182f511e49bef01e Mon Sep 17 00:00:00 2001 From: Eloi Zalczer Date: Mon, 17 Jun 2024 15:17:08 +0200 Subject: [PATCH] Added backend URL to .env configuration. --- Dockerfile | 4 ++++ docker-compose.yml | 3 +++ vite.config.ts | 28 +++++++++++++++++----------- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 750578b..29c2b8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,10 @@ FROM node:16-alpine as build WORKDIR /app +# Assign environments variables +ARG VITE_POCKETBASE_BASE_ROUTE +ENV VITE_POCKETBASE_BASE_ROUTE=${VITE_POCKETBASE_BASE_ROUTE} + COPY package.json ./ RUN ["npm", "install"] COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index 3295617..cd16eef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,9 @@ services: context: . dockerfile: Dockerfile + args: + VITE_POCKETBASE_BASE_ROUTE: "$VITE_POCKETBASE_BASE_ROUTE" + ports: - "${DOXFOOD_SERVER_PORT:-9000}:80" diff --git a/vite.config.ts b/vite.config.ts index 9dac89a..4dd3933 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,17 +1,23 @@ import { fileURLToPath, URL } from "node:url"; -import { defineConfig } from "vite"; +import { defineConfig, loadEnv } from "vite"; import vue from "@vitejs/plugin-vue"; // https://vitejs.dev/config/ -export default defineConfig({ - plugins: [vue()], - resolve: { - alias: { - "@": fileURLToPath(new URL("./src", import.meta.url)), +export default defineConfig(({ mode }) => { + const env = loadEnv(mode, process.cwd(), ""); + return { + plugins: [vue()], + resolve: { + alias: { + "@": fileURLToPath(new URL("./src", import.meta.url)), + }, }, - }, - server: { - host: "127.0.0.1", - cors: true, - }, + server: { + host: "127.0.0.1", + cors: true, + }, + define: { + "import.meta.env.VITE_POCKETBASE_BASE_ROUTE": JSON.stringify(env.VITE_POCKETBASE_BASE_ROUTE), + }, + }; });