Skip to content

Sync with upstream #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OliverWoolland merged 6 commits into from
Mar 6, 2026
Merged

Sync with upstream #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f9dad4
Clean up and simplify environment variables of TRE (#76)
AndrewThien Mar 2, 2026
cbadb13
Clean Submission env vars (#77)
AndrewThien Mar 3, 2026
1e7702f
fix: Submission Layer KeyCloak base URL (#80)
AndrewThien Mar 4, 2026
eb3496c
Add the new TRE UI service into Docker compose (#79)
AndrewThien Mar 4, 2026
ada5497
Merge remote-tracking branch 'upstream/main' into sync-with-upstream
OliverWoolland Mar 4, 2026
dbbe269
Remove exess env thanks to Annie
OliverWoolland Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions DemoStack/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DEPLOYMENT_VERSION=1.6.0
DEPLOYMENT_VERSION=1.7.2

# ----- Postgres env var ------

Expand All @@ -22,6 +22,25 @@ TRE_DATA_DATABASE=tredata
TRE_DATA_USER=admin
TRE_DATA_PASSWORD=admin

TreApiPublicUrl=http://localhost:8072
# Keycloak Host name
KeycloakHostName=localhost
# TRE KeyCloak URL
TRE_KEYCLOAK_URL=http://keycloak:8080
# Submission KeyCloak URL
SUBMISSION_KEYCLOAK_URL=http://keycloak:8080
# Minio TRE UI URL
MINIO_TRE_UI_URL=http://localhost:9003
# Submision API URL
SubmissionAPIAddressURL=http://submissionAPI:8080
# Encryption settings (Base-64 String) - Defaulted for development/demo purposes only - NEVER USE IN PRODUCTION
EncryptionSettingsKey=9pDUei4zHnuXrC0Hb0KSG0g1U4GsV6ajZf+/kYKtrI8=
# New TRE UI env vars
# Secret for Better Auth - Defaulted for development/demo purposes only - NEVER USE IN PRODUCTION
BETTER_AUTH_SECRET=r6oTUwEUlvoa4Fdh3XIBviHRVpCudrt3
BETTER_AUTH_URL=http://localhost:3000
NEXT_PUBLIC_KEYCLOAK_URL=http://localhost:8085
NEXT_PUBLIC_HELPDESK_URL=https://ukserp.atlassian.net/servicedesk/customer/portal/3

DemoMode=true # Set to true if you'd like to simulate execution, otherwise default to false:
KeyCloakDemoMode=true # Allows Keycloak to not require https:
Expand Down Expand Up @@ -106,7 +125,7 @@ SubmissionAPIKeyCloakSecret=2e60b956-16bc-4dea-8b49-118a8baac5e5
SubmissionUIAccountManagementURL=http://keycloak:8080/realms/Dare-Control/account
SubmissionUIKeyCloakBaseUrl=http://keycloak:8080/realms/Dare-Control
KeyCloakUseRedirect=false
KeyCloakClientUIRedirectURL=http://localhost:8888/
SubmissionKeyCloakClientUIRedirectURL=http://localhost:8888/
KeyCloakTokenExpiredAddressUI=http://localhost:8888/Account/LoginAfterTokenExpired
SubmissionUIClientSecret=1218304e-bf92-4706-83f6-912e0b04ecb9
SubmissionUIKeyCloakMetadataAddress=http://keycloak:8080/realms/Dare-Control/.well-known/openid-configuration
Expand Down Expand Up @@ -138,15 +157,15 @@ TreAPIKeyCloakMetadataAddress=http://keycloak:8080/realms/Dare-TRE/.well-known/o
TreAPIAccountManagementURLUI=http://localhost:8085/realms/Dare-TRE/account
TreAPIValidAudiences=Dare-TRE-API,Dare-TRE-UI

URLSettingsFrontEndQueryImage=harbor.ukserp.ac.uk/dare-trefx/control-tre-hasura:1.34.1
URLSettingsFrontEndQueryImageSQL=harbor.ukserp.ac.uk/dare-trefx/control-tre-hasura:1.34.1

# ----- Submission Server Settings -----

SuppressAntiforgery=false
SubmissionSignedOutRedirectUri=/
SubmissionTokenRefreshSeconds=3600
SubmissionValidAudiences=Dare-Control-UI,Dare-Control-API,Dare-Control-Minio
SubmissionServer=keycloak:8080
SubmissionKeyCloakServer=keycloak:8080
SubmissionServerProtocol=http
SubmissionRealm=Dare-Control
SubmissionAutoTrustKeycloakCert=false
Expand All @@ -156,10 +175,4 @@ SubmissionValidAudience=
# ------ Config path for infrastructure services ------
# ------ (Keycloak, Ldap, Ldap Init, Postgres, Realm Configuration) ------

CONFIG_PATH=../../../DemoStack/config

# ------ Encryption strings for TRE API -----
# Encryption settings (16 bytes Base-64 String)
EncryptionSettingsKey=E9gzanEsEfK32w6slO20xg==
EncryptionSettingsBase=uQV9bsRydGnkGjgz7wMQpA==

CONFIG_PATH=../../../DemoStack/config
Loading