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

Revert "lock windows at mssql cu2"

Browse Source 
This reverts commit b703eeefdb6647483d685c5d1d8535c4ec673bec.
This commit is contained in:
Kyle Spearrin 2018-03-30 16:07:01 -04:00
parent 998de639c0
commit efd6a89e34
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/Setup/DockerComposeBuilder.cs
View File

@ -15,13 +15,7 @@ namespace Bit.Setup
} }
if(!string.IsNullOrWhiteSpace(coreVersion)) if(!string.IsNullOrWhiteSpace(coreVersion))
{ {
CoreVersion = MssqlVersion = coreVersion; CoreVersion = coreVersion;
}
// Lock Windows at mssql CU2 due to various problems with later mssql docker builds.
if(os == "win")
{
MssqlVersion = "1.16.0";
} }
} }
@ -30,7 +24,6 @@ namespace Bit.Setup
public int HttpsPort { get; private set; } public int HttpsPort { get; private set; }
public string CoreVersion { get; private set; } = "latest"; public string CoreVersion { get; private set; } = "latest";
public string WebVersion { 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) public void BuildForInstaller(int httpPort, int httpsPort)
{ {
@ -102,13 +95,12 @@ namespace Bit.Setup
# Parameter:HttpsPort={HttpsPort} # Parameter:HttpsPort={HttpsPort}
# Parameter:CoreVersion={CoreVersion} # Parameter:CoreVersion={CoreVersion}
# Parameter:WebVersion={WebVersion} # Parameter:WebVersion={WebVersion}
# Parameter:MssqlVersion={MssqlVersion}
version: '3' version: '3'
services: services:
mssql: mssql:
image: bitwarden/mssql:{MssqlVersion} image: bitwarden/mssql:{CoreVersion}
container_name: bitwarden-mssql container_name: bitwarden-mssql
restart: always restart: always
volumes:"); volumes:");