From a8b00a4557e30c7b2e23f052a261553a0d7dd7d9 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Tue, 2 Jul 2024 21:45:39 +0200 Subject: [PATCH 1/4] Add .env file paths for running outside of docker --- frontends/mit-open/webpack.config.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js index 931ab9cc48..e10743b93c 100644 --- a/frontends/mit-open/webpack.config.js +++ b/frontends/mit-open/webpack.config.js @@ -1,7 +1,13 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const path = require("path") require("dotenv").config({ - path: path.resolve(__dirname, "../../.env"), + path: [ + path.resolve(__dirname, "../../env/frontend.local.env"), + path.resolve(__dirname, "../../env/frontend.env"), + path.resolve(__dirname, "../../env/shared.local.env"), + path.resolve(__dirname, "../../env/shared.env"), + path.resolve(__dirname, "../../.env"), + ], }) const webpack = require("webpack") From 9b1885ae2ede6c0bd18d1d57362ec66aa0789392 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:11:27 +0200 Subject: [PATCH 2/4] Conditionally load env files if not in docker --- frontends/mit-open/package.json | 2 +- frontends/mit-open/webpack.config.js | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/frontends/mit-open/package.json b/frontends/mit-open/package.json index d5cc76ced5..c1ebc57829 100644 --- a/frontends/mit-open/package.json +++ b/frontends/mit-open/package.json @@ -9,7 +9,7 @@ }, "scripts": { "watch": "NODE_ENV=development ENVIRONMENT=local webpack serve", - "watch:docker": "API_DEV_PROXY_BASE_URL=http://nginx:8063 NODE_ENV=development ENVIRONMENT=local webpack serve", + "watch:docker": "API_DEV_PROXY_BASE_URL=http://nginx:8063 NODE_ENV=development ENVIRONMENT=docker webpack serve", "watch:rc": "API_DEV_PROXY_BASE_URL=https://api.mitopen-rc.odl.mit.edu/ NODE_ENV=development ENVIRONMENT=local webpack serve", "build": "webpack --config webpack.config.js --bail", "build-exports": "webpack --config webpack.exports.js --bail", diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js index e10743b93c..3333044ea9 100644 --- a/frontends/mit-open/webpack.config.js +++ b/frontends/mit-open/webpack.config.js @@ -1,14 +1,17 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const path = require("path") -require("dotenv").config({ - path: [ - path.resolve(__dirname, "../../env/frontend.local.env"), - path.resolve(__dirname, "../../env/frontend.env"), - path.resolve(__dirname, "../../env/shared.local.env"), - path.resolve(__dirname, "../../env/shared.env"), - path.resolve(__dirname, "../../.env"), - ], -}) + +if (process.env.ENVIRONMENT !== "docker") { + require("dotenv").config({ + path: [ + path.resolve(__dirname, "../../env/frontend.local.env"), + path.resolve(__dirname, "../../env/frontend.env"), + path.resolve(__dirname, "../../env/shared.local.env"), + path.resolve(__dirname, "../../env/shared.env"), + path.resolve(__dirname, "../../.env"), + ], + }) +} const webpack = require("webpack") const BundleTracker = require("webpack-bundle-tracker") From 70f921d9eb7574b1069417b4fdbd523277c8c934 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Tue, 2 Jul 2024 22:17:14 +0200 Subject: [PATCH 3/4] Local only - we don't want to load in for builds --- frontends/mit-open/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js index 3333044ea9..dd7271d7b1 100644 --- a/frontends/mit-open/webpack.config.js +++ b/frontends/mit-open/webpack.config.js @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const path = require("path") -if (process.env.ENVIRONMENT !== "docker") { +if (process.env.ENVIRONMENT === "local") { require("dotenv").config({ path: [ path.resolve(__dirname, "../../env/frontend.local.env"), From c6617457a8698bfcff3c43e0b774e7337534d33d Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Tue, 2 Jul 2024 23:03:27 +0200 Subject: [PATCH 4/4] Use host 0.0.0.0 for the dev server always --- frontends/mit-open/webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontends/mit-open/webpack.config.js b/frontends/mit-open/webpack.config.js index dd7271d7b1..aa5b56c18c 100644 --- a/frontends/mit-open/webpack.config.js +++ b/frontends/mit-open/webpack.config.js @@ -2,6 +2,7 @@ const path = require("path") if (process.env.ENVIRONMENT === "local") { + console.info("Loading environment from .env files") require("dotenv").config({ path: [ path.resolve(__dirname, "../../env/frontend.local.env"), @@ -267,7 +268,7 @@ module.exports = (env, argv) => { devMiddleware: { writeToDisk: true, }, - host: ENVIRONMENT === "docker" ? "0.0.0.0" : "::", + host: "0.0.0.0", proxy: [ { context: [