From 122d1b7ed7a6930e0952f46277b559ed28d7f113 Mon Sep 17 00:00:00 2001
From: MtnBurrit0 <77340197+mimartin12@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:38:39 -0600
Subject: [PATCH] Remove ComposeVersion from template (#3972)

---
 util/Setup/Configuration.cs            | 4 ----
 util/Setup/DockerComposeBuilder.cs     | 5 -----
 util/Setup/Templates/DockerCompose.hbs | 2 --
 3 files changed, 11 deletions(-)

diff --git a/util/Setup/Configuration.cs b/util/Setup/Configuration.cs
index 37afa09c3..264eef05b 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 0d76dc9e9..b5976e90c 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -42,10 +42,6 @@ public class DockerComposeBuilder
     {
         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 class DockerComposeBuilder
             }
         }
 
-        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 851dcdd11..d9ad6c461 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}}}