From 09c1b2e07ed36ceb840f478719b03fd14b3ab80f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 14 Apr 2023 14:23:08 -0400 Subject: [PATCH] set internal vault uri correctly (#2849) * set internal vault uri correctly * Update docker-unified/entrypoint.sh Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> * Update docker-unified/entrypoint.sh Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> --------- Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com> --- docker-unified/Dockerfile | 2 +- docker-unified/entrypoint.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-unified/Dockerfile b/docker-unified/Dockerfile index 04952c3d1c..5f0a0ed8a5 100644 --- a/docker-unified/Dockerfile +++ b/docker-unified/Dockerfile @@ -203,7 +203,7 @@ ENV globalSettings__baseServiceUri__internalIdentity="http://localhost:5005" ENV globalSettings__baseServiceUri__internalNotifications="http://localhost:5006" ENV globalSettings__baseServiceUri__internalSso="http://localhost:5007" ENV globalSettings__baseServiceUri__internalScim="http://localhost:5002" -ENV globalSettings__baseServiceUri__internalVault="http://localhost:80" +ENV globalSettings__baseServiceUri__internalVault="http://localhost:8080" ENV globalSettings__identityServer__certificatePassword="default_cert_password" ENV globalSettings__dataProtection__directory="/etc/bitwarden/data-protection" ENV globalSettings__attachment__baseDirectory="/etc/bitwarden/attachments" diff --git a/docker-unified/entrypoint.sh b/docker-unified/entrypoint.sh index 86c7393982..a04337c6a7 100755 --- a/docker-unified/entrypoint.sh +++ b/docker-unified/entrypoint.sh @@ -31,6 +31,12 @@ export globalSettings__postgreSql__connectionString=${globalSettings__postgreSql export globalSettings__sqlServer__connectionString=${globalSettings__sqlServer__connectionString:-$SQLSERVER_CONNECTION_STRING} export globalSettings__sqlite__connectionString=${globalSettings__sqlite__connectionString:-$SQLITE_CONNECTION_STRING} +if [ "$BW_ENABLE_SSL" = "true" ]; then + export globalSettings__baseServiceUri__internalVault=https://localhost:${BW_PORT_HTTPS:-8443} +else + export globalSettings__baseServiceUri__internalVault=http://localhost:${BW_PORT_HTTP:-8080} +fi + # Generate Identity certificate if [ ! -f /etc/bitwarden/identity.pfx ]; then openssl req \