From c32c4fbb4eaf059479a02eeba7bbf475c43231a3 Mon Sep 17 00:00:00 2001 From: Manuel Romero Date: Thu, 17 Oct 2024 12:28:46 +0200 Subject: [PATCH] Using env --- docker-compose.yml | 2 ++ server/server.js | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fbc4670..6749a96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -61,6 +61,8 @@ services: - source: qmicloud_config target: config.json environment: + - BACKEND_LOGS_URL=http://host.docker.internal:8888/ + - QMI_MONGO_URL=http://host.docker.internal:8081/ - GUACA_PASSWORD=acupoftea1234! - HOSTNAME_URL=http://localhost:3000 - REDIS_URL=redis://redis diff --git a/server/server.js b/server/server.js index 645eec5..2e64a2c 100644 --- a/server/server.js +++ b/server/server.js @@ -37,7 +37,8 @@ const passport = require('./passport-okta'); //const qsProxy = require("./routes/qsProxy"); -const QMI_MONGO_URL = process.env.QMI_MONGO_URL; +const QMI_MONGO_URL = process.env.QMI_MONGO_URL || "http://host.docker.internal:8081/"; +const BACKEND_LOGS_URL = process.env.BACKEND_LOGS_URL || "http://host.docker.internal:8888/"; const IS_SECURE = process.env.CERT_PFX_PASSWORD && process.env.CERT_PFX_FILENAME; @@ -144,7 +145,7 @@ app.use('/guacamole/', passport.ensureAuthenticatedAndVPNDoLogin, createProxyMid DOZZLE */ app.use('/dockerlogs/', passport.ensureAuthenticatedAndAdmin, createProxyMiddleware({ - target: 'http://host.docker.internal:8888/', + target: BACKEND_LOGS_URL, ws: false, changeOrigin: true, followRedirects: false, @@ -156,7 +157,7 @@ app.use('/dockerlogs/', passport.ensureAuthenticatedAndAdmin, createProxyMiddlew MONGOEXPRESS */ app.use('/mongo', passport.ensureAuthenticatedAndAdmin, createProxyMiddleware({ - target: 'http://host.docker.internal:8081/', + target: QMI_MONGO_URL, ws: false, changeOrigin: true, followRedirects: true,