From 53ebf925aa4752ada57be85ef4603f3a5e9858c9 Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Thu, 15 Dec 2022 23:59:52 +0300
Subject: [PATCH] Finally fixed envs

---
 Dockerfile             | 2 ++
 webpack.config.dev.js  | 2 +-
 webpack.config.prod.js | 8 ++------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 16553d2..0be2ff5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /app
 COPY ./package.json ./
 RUN npm install
 COPY ./ ./
+ENV PUBLIC_API_URL=https://publitebackend.dm1sh.ru
+ENV PUBLIC_BASE_URL=https://publite.dm1sh.ru
 RUN NODE_ENV=production npm run build
 
 FROM node:alpine
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index b8068aa..662f224 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -19,8 +19,8 @@ module.exports = {
   plugins: [
     new webpack.DefinePlugin({
       "process.env.NODE_ENV": JSON.stringify("development"),
-      "process.env.PUBLIC_BASE_URL": JSON.stringify("http://localhost:8080"),
       "process.env.PUBLIC_API_URL": JSON.stringify("http://localhost:8081"),
+      "process.env.PUBLIC_BASE_URL": JSON.stringify("http://localhost:8080"),
     }),
     ...webpackConfig.plugins,
   ],
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 4919ceb..10ffd76 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -12,12 +12,8 @@ module.exports = {
   plugins: [
     new webpack.DefinePlugin({
       "process.env.NODE_ENV": JSON.stringify("production"),
-      "process.env.PUBLIC_BASE_URL": JSON.stringify(
-        "https://publite.dmitriy.icu"
-      ),
-      "process.env.PUBLIC_API_URL": JSON.stringify(
-        "https://publitebackend.dmitriy.icu"
-      ),
+      "process.env.PUBLIC_API_URL": JSON.stringify(process.env.PUBLIC_API_URL),
+      "process.env.PUBLIC_BASE_URL": JSON.stringify(process.env.PUBLIC_BASE_URL),
     }),
     ...webpackConfig.plugins,
   ],