From b7a93cd7ada44b77c005be3b89a1b7b938d99d1f Mon Sep 17 00:00:00 2001 From: David Edler Date: Wed, 17 May 2023 09:09:00 +0200 Subject: [PATCH] feat(setup) configurable backend ip for dev mode WD-3856 --- .env | 3 ++- entrypoint | 6 ++++++ haproxy-dev.cfg | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a5b7a6a237..ede15fff02 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ ENVIRONMENT=devel -PORT=8407 \ No newline at end of file +PORT=8407 +LXD_UI_BACKEND_IP=172.17.0.1 diff --git a/entrypoint b/entrypoint index 948db20330..c356faa094 100755 --- a/entrypoint +++ b/entrypoint @@ -11,6 +11,12 @@ if [[ ! -z "$LXD_UI_BACKEND_KEY_PEM" ]]; then # dev config else cp haproxy-dev.cfg haproxy-local.cfg + set -o allexport; source .env; set +o allexport + if [ -f .env.local ] + then + set -o allexport; source .env.local; set +o allexport + fi + sed -i "s#LXD_UI_BACKEND_IP#$LXD_UI_BACKEND_IP#" haproxy-local.cfg # generate certificates for dev environment if [ ! -d "keys" ]; then mkdir -p keys diff --git a/haproxy-dev.cfg b/haproxy-dev.cfg index 149a286846..e8955dd764 100644 --- a/haproxy-dev.cfg +++ b/haproxy-dev.cfg @@ -18,4 +18,4 @@ backend lxd_ui server yarn_serve_port 127.0.0.1:3000 backend lxd_core - server lxd_https 172.17.0.1:8443 ssl verify none crt keys/lxd-ui.pem + server lxd_https LXD_UI_BACKEND_IP:8443 ssl verify none crt keys/lxd-ui.pem