From 10c94c4c2440a3cd405abcb41f7f1c16b8c3ab3b Mon Sep 17 00:00:00 2001 From: dragongoose Date: Mon, 10 Apr 2023 16:33:11 -0400 Subject: [PATCH] Fix building steps --- docker/Dockerfile | 7 +++++++ docker/docker-compose.yml | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9a6b8b3..a8ed3d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,13 @@ FROM node:16 AS builder # Set working directory WORKDIR /app +ARG VITE_BACKEND_DOMAIN +ARG VITE_INSTANCE_DOMAIN +ARG VITE_HTTPS + +ENV VITE_BACKEND_DOMAIN $VITE_BACKEND_DOMAIN +ENV VITE_INSTANCE_DOMAIN $VITE_INSTANCE_DOMAIN +ENV VITE_HTTPS $VITE_HTTPS # Copy all files from current directory to working dir in image COPY . . # install node modules and build assets diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0e0c3c2..3220118 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,8 +4,9 @@ services: build: context: "../" dockerfile: ./docker/Dockerfile + args : + - VITE_BACKEND_DOMAIN=localhost:7000 + - VITE_INSTANCE_DOMAIN=localhost:80 + - VITE_HTTPS=false ports: - - "8080:80" - environment: - - VITE_BACKEND_URL=http://localhost:7000 - - VITE_INSTANCE_URL=http://localhost:80 + - "8080:80" \ No newline at end of file