nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-23 18:41:47 -05:00
Code Activity

fix: flip bool condition and make it nullable

Browse Source
This commit is contained in:
tangowithfoxtrot
2024-10-28 12:45:32 -07:00
parent 1d87ba3a46
commit 02393835f8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/Setup/Configuration.cs
View File

@ -97,8 +97,8 @@ public class Configuration
[Description("Enable SCIM")] [Description("Enable SCIM")]
public bool EnableScim { get; set; } = false; public bool EnableScim { get; set; } = false;
[Description("Disable Built-In MSSQL Container Generation")] [Description("Enable Built-In MSSQL Container Generation")]
public bool DisableBuiltInMsSql { get; set; } public bool? EnableBuiltInMsSql { get; set; } = true;
[YamlIgnore] [YamlIgnore]
public string Domain public string Domain

4
util/Setup/DockerComposeBuilder.cs
View File

@ -42,7 +42,7 @@ public class DockerComposeBuilder
{ {
public TemplateModel(Context context) public TemplateModel(Context context)
{ {
DisableBuiltInMsSql = context.Config.DisableBuiltInMsSql; EnableBuiltInMsSql = context.Config.EnableBuiltInMsSql;
MssqlDataDockerVolume = context.Config.DatabaseDockerVolume; MssqlDataDockerVolume = context.Config.DatabaseDockerVolume;
EnableKeyConnector = context.Config.EnableKeyConnector; EnableKeyConnector = context.Config.EnableKeyConnector;
EnableScim = context.Config.EnableScim; EnableScim = context.Config.EnableScim;
@ -62,7 +62,7 @@ public class DockerComposeBuilder
} }
} }
public bool DisableBuiltInMsSql { get; set; } public bool? EnableBuiltInMsSql { get; set; }
public bool MssqlDataDockerVolume { get; set; } public bool MssqlDataDockerVolume { get; set; }
public bool EnableKeyConnector { get; set; } public bool EnableKeyConnector { get; set; }
public bool EnableScim { get; set; } public bool EnableScim { get; set; }

6
util/Setup/Templates/DockerCompose.hbs
View File

@ -14,7 +14,7 @@
######################################################################### #########################################################################
services: services:
{{#if DisableBuiltInMsSql}} {{#if EnableBuiltInMsSql}}
mssql: mssql:
image: bitwarden/mssql:{{{CoreVersion}}} image: bitwarden/mssql:{{{CoreVersion}}}
container_name: bitwarden-mssql container_name: bitwarden-mssql
@ -32,8 +32,8 @@ services:
- mssql.env - mssql.env
- ../env/uid.env - ../env/uid.env
- ../env/mssql.override.env - ../env/mssql.override.env
{{/if}}
{{/if}}
web: web:
image: bitwarden/web:{{{WebVersion}}} image: bitwarden/web:{{{WebVersion}}}
container_name: bitwarden-web container_name: bitwarden-web
@ -108,8 +108,10 @@ services:
image: bitwarden/admin:{{{CoreVersion}}} image: bitwarden/admin:{{{CoreVersion}}}
container_name: bitwarden-admin container_name: bitwarden-admin
restart: always restart: always
{{#if EnableBuiltInMsSql}}
depends_on: depends_on:
- mssql - mssql
{{/if}}
volumes: volumes:
- ../core:/etc/bitwarden/core - ../core:/etc/bitwarden/core
- ../ca-certificates:/etc/bitwarden/ca-certificates - ../ca-certificates:/etc/bitwarden/ca-certificates