Skip to content

Commit

Permalink
Revert "feat: prepare environment variables for shell (onecx#126)" (o…
Browse files Browse the repository at this point in the history
…necx#130)

This reverts commit ef04a80.
  • Loading branch information
milanhorvath authored Jun 14, 2024
1 parent ef04a80 commit 32e77fc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY nginx/locations.conf $DIR_LOCATION/locations.conf
COPY dist/onecx-shell-ui/ $DIR_HTML

# Optional extend list of application environments
ENV CONFIG_ENV_LIST BFF_URL,APP_BASE_HREF,CORS_ENABLED,APP_VERSION,APP_ID,PRODUCT_NAME,TKIT_PORTAL_URL,EXTENSIONS_BFF_URL,AUTH_SERVICE,AUTH_SERVICE_CUSTOM_URL,AUTH_SERVICE_CUSTOM_MODULE_NAME
#ENV CONFIG_ENV_LIST BFF_URL,APP_BASE_HREF

# Application environments default values
ENV BFF_URL http://onecx-shell-bff:8080/
Expand Down
5 changes: 0 additions & 5 deletions nginx/locations.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ location @@APP_BASE_HREFshell-bff {
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr;
}
location @@APP_BASE_HREFextensions-bff {
proxy_pass @@EXTENSIONS_BFF_URL;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr;
}
18 changes: 7 additions & 11 deletions src/assets/env.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{
"APP_BASE_HREF": "${APP_BASE_HREF}",
"KEYCLOAK_REALM": "${KEYCLOAK_REALM}",
"KEYCLOAK_URL": "${KEYCLOAK_URL}",
"KEYCLOAK_CLIENT_ID": "${KEYCLOAK_CLIENT_ID}",
"APP_VERSION": "${APP_VERSION}",
"IS_SHELL": true,
"EXTENSIONS_BFF_URL": "${EXTENSIONS_BFF_URL}",
"AUTH_SERVICE": "${AUTH_SERVICE}",
"AUTH_SERVICE_CUSTOM_URL": "${AUTH_SERVICE_CUSTOM_URL}",
"AUTH_SERVICE_CUSTOM_MODULE_NAME": "${AUTH_SERVICE_CUSTOM_MODULE_NAME}"
}
"APP_BASE_HREF": "${APP_BASE_HREF}",
"KEYCLOAK_REALM": "${KEYCLOAK_REALM}",
"KEYCLOAK_URL": "${KEYCLOAK_URL}",
"KEYCLOAK_CLIENT_ID": "${KEYCLOAK_CLIENT_ID}",
"APP_VERSION": "${APP_VERSION}",
"IS_SHELL": true
}

0 comments on commit 32e77fc

Please sign in to comment.