NOISSUE - Update UI environment variables (#2107)

Signed-off-by: ianmuchyri <[email protected]>
absmach · Mar 7, 2024 · 163ccbb · 163ccbb
1 parent 42d433a
commit 163ccbb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/docker/.env b/docker/.env
@@ -140,6 +140,33 @@ MG_INVITATIONS_DB_SSL_KEY=
 MG_INVITATIONS_DB_SSL_ROOT_CERT=
 MG_INVITATIONS_INSTANCE_ID=
 
+### UI
+MG_UI_LOG_LEVEL=debug
+MG_UI_PORT=9095
+MG_HTTP_ADAPTER_URL=http://http-adapter:8008
+MG_READER_URL=http://timescale-reader:9011
+MG_THINGS_URL=http://things:9000
+MG_USERS_URL=http://users:9002
+MG_INVITATIONS_URL=http://invitations:9020
+MG_DOMAINS_URL=http://auth:8189
+MG_BOOTSTRAP_URL=http://bootstrap:9013
+MG_UI_HOST_URL=http://localhost:9095
+MG_UI_VERIFICATION_TLS=false
+MG_UI_CONTENT_TYPE=application/senml+json
+MG_UI_INSTANCE_ID=
+MG_UI_DB_HOST=ui-db
+MG_UI_DB_PORT=5432
+MG_UI_DB_USER=magistrala
+MG_UI_DB_PASS=magistrala
+MG_UI_DB_NAME=ui
+MG_UI_DB_SSL_MODE=disable
+MG_UI_DB_SSL_CERT=
+MG_UI_DB_SSL_KEY=
+MG_UI_DB_SSL_ROOT_CERT=
+MG_UI_HASH_KEY=5jx4x2Qg9OUmzpP5dbveWQ
+MG_UI_BLOCK_KEY=UtgZjr92jwRY6SPUndHXiyl9QY8qTUyZ
+MG_UI_PATH_PREFIX=/ui
+
 ### Users
 MG_USERS_LOG_LEVEL=debug
 MG_USERS_SECRET_KEY=HyE2D4RUt9nnKG6v8zKEqAp6g6ka8hhZsqUpzgKvnwpXrNVQSH
@@ -165,8 +192,8 @@ MG_USERS_DB_SSL_ROOT_CERT=
 MG_USERS_RESET_PWD_TEMPLATE=users.tmpl
 MG_USERS_INSTANCE_ID=
 MG_USERS_ALLOW_SELF_REGISTER=true
-MG_OAUTH_UI_REDIRECT_URL="http://localhost:9095/tokens/secure"
-MG_OAUTH_UI_ERROR_URL="http://localhost:9095/error"
+MG_OAUTH_UI_REDIRECT_URL=http://localhost:9095${MG_UI_PATH_PREFIX}/tokens/secure
+MG_OAUTH_UI_ERROR_URL=http://localhost:9095${MG_UI_PATH_PREFIX}/error
 
 ### Email utility
 MG_EMAIL_HOST=smtp.mailtrap.io
@@ -252,32 +279,6 @@ MG_WS_ADAPTER_HTTP_SERVER_CERT=
 MG_WS_ADAPTER_HTTP_SERVER_KEY=
 MG_WS_ADAPTER_INSTANCE_ID=
 
-### UI
-MG_UI_LOG_LEVEL=debug
-MG_UI_PORT=9095
-MG_HTTP_ADAPTER_URL=http://http-adapter:8008
-MG_READER_URL=http://mongodb-reader:9007
-MG_THINGS_URL=http://things:9000
-MG_USERS_URL=http://users:9002
-MG_INVITATIONS_URL=http://invitations:9020
-MG_DOMAINS_URL=http://auth:8189
-MG_BOOTSTRAP_URL=http://bootstrap:9013
-MG_UI_HOST_URL=http://localhost:9095
-MG_UI_VERIFICATION_TLS=false
-MG_UI_CONTENT_TYPE=application/senml+json
-MG_UI_INSTANCE_ID=
-MG_UI_DB_HOST=ui-db
-MG_UI_DB_PORT=5432
-MG_UI_DB_USER=magistrala
-MG_UI_DB_PASS=magistrala
-MG_UI_DB_NAME=ui
-MG_UI_DB_SSL_MODE=disable
-MG_UI_DB_SSL_CERT=
-MG_UI_DB_SSL_KEY=
-MG_UI_DB_SSL_ROOT_CERT=
-MG_UI_HASH_KEY=5jx4x2Qg9OUmzpP5dbveWQ
-MG_UI_BLOCK_KEY=UtgZjr92jwRY6SPUndHXiyl9QY8qTUyZ
-
 ## Addons Services
 ### Bootstrap
 MG_BOOTSTRAP_LOG_LEVEL=debug

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -741,6 +741,7 @@ services:
       MG_GOOGLE_STATE: ${MG_GOOGLE_STATE}
       MG_UI_HASH_KEY: ${MG_UI_HASH_KEY}
       MG_UI_BLOCK_KEY: ${MG_UI_BLOCK_KEY}
+      MG_UI_PATH_PREFIX: ${MG_UI_PATH_PREFIX}
     ports:
       - ${MG_UI_PORT}:${MG_UI_PORT}
     networks: