From efd6a89e3406675e28199f0a0265e19adb395d39 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 30 Mar 2018 16:07:01 -0400
Subject: [PATCH] Revert "lock windows at mssql cu2"
This reverts commit b703eeefdb6647483d685c5d1d8535c4ec673bec.
---
util/Setup/DockerComposeBuilder.cs | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index daef504a5b..2ff122a8ba 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -15,13 +15,7 @@ namespace Bit.Setup
}
if(!string.IsNullOrWhiteSpace(coreVersion))
{
- CoreVersion = MssqlVersion = coreVersion;
- }
-
- // Lock Windows at mssql CU2 due to various problems with later mssql docker builds.
- if(os == "win")
- {
- MssqlVersion = "1.16.0";
+ CoreVersion = coreVersion;
}
}
@@ -30,7 +24,6 @@ namespace Bit.Setup
public int HttpsPort { get; private set; }
public string CoreVersion { get; private set; } = "latest";
public string WebVersion { get; private set; } = "latest";
- public string MssqlVersion { get; private set; } = "latest";
public void BuildForInstaller(int httpPort, int httpsPort)
{
@@ -102,13 +95,12 @@ namespace Bit.Setup
# Parameter:HttpsPort={HttpsPort}
# Parameter:CoreVersion={CoreVersion}
# Parameter:WebVersion={WebVersion}
-# Parameter:MssqlVersion={MssqlVersion}
version: '3'
services:
mssql:
- image: bitwarden/mssql:{MssqlVersion}
+ image: bitwarden/mssql:{CoreVersion}
container_name: bitwarden-mssql
restart: always
volumes:");