nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

Feature/add key-connector version to self-hosted scripts (#1784)

Browse Source 
* Added Key Connector version

* Fix updatebw() for Key Connector

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
This commit is contained in:
Micaiah Martin
2021-12-29 09:07:16 -07:00
committed by GitHub
parent 355bf2127b
commit 735f58dd6f
8 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
util/Setup/Context.cs
View File

@ -18,6 +18,7 @@ namespace Bit.Setup
public string HostOS { get; set; } = "win";
public string CoreVersion { get; set; } = "latest";
public string WebVersion { get; set; } = "latest";
public string KeyConnectorVersion { get; set; } = "latest";
public Installation Install { get; set; } = new Installation();
public Configuration Config { get; set; } = new Configuration();

5
util/Setup/DockerComposeBuilder.cs
View File

@ -61,6 +61,10 @@ namespace Bit.Setup
{
WebVersion = context.WebVersion;
}
if (!string.IsNullOrWhiteSpace(context.KeyConnectorVersion))
{
KeyConnectorVersion = context.KeyConnectorVersion;
}
}
public string ComposeVersion { get; set; } = "3";
@ -71,6 +75,7 @@ namespace Bit.Setup
public bool HasPort => !string.IsNullOrWhiteSpace(HttpPort) || !string.IsNullOrWhiteSpace(HttpsPort);
public string CoreVersion { get; set; } = "latest";
public string WebVersion { get; set; } = "latest";
public string KeyConnectorVersion { get; set; } = "latest";
}
}
}

4
util/Setup/Program.cs
View File

@ -38,6 +38,10 @@ namespace Bit.Setup
{
_context.WebVersion = _context.Parameters["webv"];
}
if (_context.Parameters.ContainsKey("keyconnectorv"))
{
_context.KeyConnectorVersion = _context.Parameters["keyconnectorv"];
}
if (_context.Parameters.ContainsKey("stub"))
{
_context.Stub = _context.Parameters["stub"] == "true" ||

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

@ -197,7 +197,7 @@ services:
{{#if EnableKeyConnector}}
key-connector:
image: bitwarden/key-connector:latest
image: bitwarden/key-connector:{{{KeyConnectorVersion}}}
container_name: bitwarden-key-connector
restart: always
volumes: