nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 13:08:17 -05:00
Code

Remove ComposeVersion from template (#3972)

Browse Source
This commit is contained in:
MtnBurrit0 2024-04-15 14:38:39 -06:00 committed by GitHub
parent 0512102189
commit 122d1b7ed7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/Setup/Configuration.cs
View File

@ -31,10 +31,6 @@ public class Configuration
"Learn more: https://docs.docker.com/compose/compose-file/#ports")] "Learn more: https://docs.docker.com/compose/compose-file/#ports")]
public string HttpsPort { get; set; } = "443"; public string HttpsPort { get; set; } = "443";
[Description("Docker compose file version. Leave empty for default.\n" +
"Learn more: https://docs.docker.com/compose/compose-file/compose-versioning/")]
public string ComposeVersion { get; set; }
[Description("Configure Nginx for Captcha.")] [Description("Configure Nginx for Captcha.")]
public bool Captcha { get; set; } = false; public bool Captcha { get; set; } = false;

5
util/Setup/DockerComposeBuilder.cs
View File

@ -42,10 +42,6 @@ public class DockerComposeBuilder
{ {
public TemplateModel(Context context) public TemplateModel(Context context)
{ {
if (!string.IsNullOrWhiteSpace(context.Config.ComposeVersion))
{
ComposeVersion = context.Config.ComposeVersion;
}
MssqlDataDockerVolume = context.Config.DatabaseDockerVolume; MssqlDataDockerVolume = context.Config.DatabaseDockerVolume;
EnableKeyConnector = context.Config.EnableKeyConnector; EnableKeyConnector = context.Config.EnableKeyConnector;
EnableScim = context.Config.EnableScim; EnableScim = context.Config.EnableScim;
@ -65,7 +61,6 @@ public class DockerComposeBuilder
} }
} }
public string ComposeVersion { get; set; } = "3";
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; }

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

@ -13,8 +13,6 @@
# ./bwdata/config.yml file for your installation. # # ./bwdata/config.yml file for your installation. #
######################################################################### #########################################################################
version: '{{{ComposeVersion}}}'
services: services:
mssql: mssql:
image: bitwarden/mssql:{{{CoreVersion}}} image: bitwarden/mssql:{{{CoreVersion}}}