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

new dir for docker env overrides dir

Browse Source
This commit is contained in:
Kyle Spearrin 2017-08-19 22:09:00 -04:00
parent aa56b51cb5
commit abcb63bf25
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docker/docker-compose.linux.yml
View File

@ -3,31 +3,31 @@ version: '3'
services: services:
mssql: mssql:
volumes: volumes:
- /etc/bitwarden/mssql_data:/var/opt/mssql/data - ../../mssql_data:/var/opt/mssql/data
env_file: env_file:
- mssql.env - mssql.env
- /etc/bitwarden/docker/mssql.override.env - ../../env/mssql.override.env
web: web:
volumes: volumes:
- /etc/bitwarden/web:/etc/bitwarden/web - ../../web:/etc/bitwarden/web
attachments: attachments:
volumes: volumes:
- /etc/bitwarden/core/attachments:/etc/bitwarden/core/attachments - ../../core/attachments:/etc/bitwarden/core/attachments
api: api:
volumes: volumes:
- /etc/bitwarden/core:/etc/bitwarden/core - ../../core:/etc/bitwarden/core
env_file: env_file:
- global.env - global.env
- /etc/bitwarden/docker/global.override.env - ../../env/global.override.env
identity: identity:
volumes: volumes:
- /etc/bitwarden/identity:/etc/bitwarden/identity - ../../identity:/etc/bitwarden/identity
- /etc/bitwarden/core:/etc/bitwarden/core - ../../core:/etc/bitwarden/core
env_file: env_file:
- global.env - global.env
- /etc/bitwarden/docker/global.override.env - ../../env/global.override.env
nginx: nginx:
volumes: volumes:
- /etc/bitwarden/nginx:/etc/bitwarden/nginx - ../../nginx:/etc/bitwarden/nginx
- /etc/bitwarden/letsencrypt:/etc/letsencrypt - ../../letsencrypt:/etc/letsencrypt
- /etc/bitwarden/ssl:/etc/ssl - ../../ssl:/etc/ssl

22
docker/docker-compose.mac.yml
View File

@ -6,30 +6,30 @@ services:
- mssql_data:/var/opt/mssql/data - mssql_data:/var/opt/mssql/data
env_file: env_file:
- mssql.env - mssql.env
- /etc/bitwarden/docker/mssql.override.env - ../../env/mssql.override.env
web: web:
volumes: volumes:
- /etc/bitwarden/web:/etc/bitwarden/web - ../../web:/etc/bitwarden/web
attachments: attachments:
volumes: volumes:
- /etc/bitwarden/core/attachments:/etc/bitwarden/core/attachments - ../../core/attachments:/etc/bitwarden/core/attachments
api: api:
volumes: volumes:
- /etc/bitwarden/core:/etc/bitwarden/core - ../../core:/etc/bitwarden/core
env_file: env_file:
- global.env - global.env
- /etc/bitwarden/docker/global.override.env - ../../env/global.override.env
identity: identity:
volumes: volumes:
- /etc/bitwarden/identity:/etc/bitwarden/identity - ../../identity:/etc/bitwarden/identity
- /etc/bitwarden/core:/etc/bitwarden/core - ../../core:/etc/bitwarden/core
env_file: env_file:
- global.env - global.env
- /etc/bitwarden/docker/global.override.env - ../../env/global.override.env
nginx: nginx:
volumes: volumes:
- /etc/bitwarden/nginx:/etc/bitwarden/nginx - ../../nginx:/etc/bitwarden/nginx
- /etc/bitwarden/letsencrypt:/etc/letsencrypt - ../../letsencrypt:/etc/letsencrypt
- /etc/bitwarden/ssl:/etc/ssl - ../../ssl:/etc/ssl
volumes: volumes:
mssql_data: mssql_data:

4
util/Setup/Helpers.cs
View File

@ -110,12 +110,12 @@ namespace Setup
public static string GetDatabasePasswordFronEnvFile() public static string GetDatabasePasswordFronEnvFile()
{ {
if(!File.Exists("/bitwarden/docker/mssql.override.env")) if(!File.Exists("/bitwarden/env/mssql.override.env"))
{ {
return null; return null;
} }
var lines = File.ReadAllLines("/bitwarden/docker/mssql.override.env"); var lines = File.ReadAllLines("/bitwarden/env/mssql.override.env");
foreach(var line in lines) foreach(var line in lines)
{ {
if(line.StartsWith("SA_PASSWORD=")) if(line.StartsWith("SA_PASSWORD="))

6
util/Setup/Program.cs
View File

@ -360,11 +360,11 @@ server {{
private static void BuildEnvironmentFiles() private static void BuildEnvironmentFiles()
{ {
Console.WriteLine("Building docker environment override files."); Console.WriteLine("Building docker environment override files.");
Directory.CreateDirectory("/bitwarden/docker/"); Directory.CreateDirectory("/bitwarden/env/");
var dbPass = Helpers.SecureRandomString(32); var dbPass = Helpers.SecureRandomString(32);
var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", dbPass); var dbConnectionString = Helpers.MakeSqlConnectionString("mssql", "vault", "sa", dbPass);
using(var sw = File.CreateText("/bitwarden/docker/global.override.env")) using(var sw = File.CreateText("/bitwarden/env/global.override.env"))
{ {
sw.Write($@"globalSettings__baseServiceUri__vault={_url} sw.Write($@"globalSettings__baseServiceUri__vault={_url}
globalSettings__baseServiceUri__api={_url}/api globalSettings__baseServiceUri__api={_url}/api
@ -389,7 +389,7 @@ globalSettings__pushRelayBaseUri=REPLACE");
} }
} }
using(var sw = File.CreateText("/bitwarden/docker/mssql.override.env")) using(var sw = File.CreateText("/bitwarden/env/mssql.override.env"))
{ {
sw.Write($@"ACCEPT_EULA=Y sw.Write($@"ACCEPT_EULA=Y
MSSQL_PID=Express MSSQL_PID=Express