From a8aeadd1384ae16fb731b1050756b2b269e595f2 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 21 Dec 2022 11:23:17 -0500 Subject: [PATCH] add support for unified sqlite config (#2513) --- docker-unified/Dockerfile | 1 + docker-unified/entrypoint.sh | 2 ++ docker-unified/settings.env | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-unified/Dockerfile b/docker-unified/Dockerfile index 1bed5b9577..3ccd12914e 100644 --- a/docker-unified/Dockerfile +++ b/docker-unified/Dockerfile @@ -185,6 +185,7 @@ ENV BW_ENABLE_IDENTITY=true ENV BW_ENABLE_NOTIFICATIONS=true ENV BW_ENABLE_SCIM=false ENV BW_ENABLE_SSO=false +ENV BW_DB_FILE="/etc/bitwarden/vault.db" ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false ENV globalSettings__selfHosted="true" ENV globalSettings__pushRelayBaseUri="https://push.bitwarden.com" diff --git a/docker-unified/entrypoint.sh b/docker-unified/entrypoint.sh index 2a0ce82368..2d6f46ea2b 100755 --- a/docker-unified/entrypoint.sh +++ b/docker-unified/entrypoint.sh @@ -14,6 +14,7 @@ VAULT_SERVICE_URI=https://$BW_DOMAIN MYSQL_CONNECTION_STRING="server=$BW_DB_SERVER;database=$BW_DB_DATABASE;user=$BW_DB_USERNAME;password=$BW_DB_PASSWORD" POSTGRESQL_CONNECTION_STRING="Host=$BW_DB_SERVER;Database=$BW_DB_DATABASE;Username=$BW_DB_USERNAME;Password=$BW_DB_PASSWORD" SQLSERVER_CONNECTION_STRING="Server=$BW_DB_SERVER;Database=$BW_DB_DATABASE;User Id=$BW_DB_USERNAME;Password=$BW_DB_PASSWORD;" +SQLITE_CONNECTION_STRING="Data Source=$BW_DB_FILE;" INTERNAL_IDENTITY_KEY=$(openssl rand -hex 30) OIDC_IDENTITY_CLIENT_KEY=$(openssl rand -hex 30) DUO_AKEY=$(openssl rand -hex 30) @@ -29,6 +30,7 @@ export globalSettings__databaseProvider=$BW_DB_PROVIDER export globalSettings__mysql__connectionString=${globalSettings__mysql__connectionString:-$MYSQL_CONNECTION_STRING} export globalSettings__postgreSql__connectionString=${globalSettings__postgreSql__connectionString:-$POSTGRESQL_CONNECTION_STRING} export globalSettings__sqlServer__connectionString=${globalSettings__sqlServer__connectionString:-$SQLSERVER_CONNECTION_STRING} +export globalSettings__sqlite__connectionString=${globalSettings__sqlite__connectionString:-$SQLITE_CONNECTION_STRING} # Generate Identity certificate if [ ! -f /etc/bitwarden/identity.pfx ]; then diff --git a/docker-unified/settings.env b/docker-unified/settings.env index 8d55e5fba6..d02943baaf 100644 --- a/docker-unified/settings.env +++ b/docker-unified/settings.env @@ -6,7 +6,7 @@ BW_DOMAIN=bitwarden.yourdomain.com # Database -# Available providers are sqlserver, postgresql, or mysql/mariadb +# Available providers are sqlserver, postgresql, mysql/mariadb, or sqlite BW_DB_PROVIDER=mysql BW_DB_SERVER=db BW_DB_DATABASE=bitwarden_vault