diff --git a/util/Setup/Configuration.cs b/util/Setup/Configuration.cs index 37afa09c3a8e..264eef05b28a 100644 --- a/util/Setup/Configuration.cs +++ b/util/Setup/Configuration.cs @@ -31,10 +31,6 @@ public class Configuration "Learn more: https://docs.docker.com/compose/compose-file/#ports")] 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.")] public bool Captcha { get; set; } = false; diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs index 0d76dc9e923d..b5976e90ccf0 100644 --- a/util/Setup/DockerComposeBuilder.cs +++ b/util/Setup/DockerComposeBuilder.cs @@ -42,10 +42,6 @@ public class TemplateModel { public TemplateModel(Context context) { - if (!string.IsNullOrWhiteSpace(context.Config.ComposeVersion)) - { - ComposeVersion = context.Config.ComposeVersion; - } MssqlDataDockerVolume = context.Config.DatabaseDockerVolume; EnableKeyConnector = context.Config.EnableKeyConnector; EnableScim = context.Config.EnableScim; @@ -65,7 +61,6 @@ public TemplateModel(Context context) } } - public string ComposeVersion { get; set; } = "3"; public bool MssqlDataDockerVolume { get; set; } public bool EnableKeyConnector { get; set; } public bool EnableScim { get; set; } diff --git a/util/Setup/Templates/DockerCompose.hbs b/util/Setup/Templates/DockerCompose.hbs index 851dcdd111a2..d9ad6c4613aa 100644 --- a/util/Setup/Templates/DockerCompose.hbs +++ b/util/Setup/Templates/DockerCompose.hbs @@ -13,8 +13,6 @@ # ./bwdata/config.yml file for your installation. # ######################################################################### -version: '{{{ComposeVersion}}}' - services: mssql: image: bitwarden/mssql:{{{CoreVersion}}}