Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

load ca-certs for api and identity

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-29 08:59:50 -04:00
parent 4ce69dac2b
commit d2bdaa8baa
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/entrypoint.sh
View File

@ -24,9 +24,13 @@ chown -R $USERNAME:$USERNAME /app
chown -R $USERNAME:$USERNAME /jobs chown -R $USERNAME:$USERNAME /jobs
mkdir -p /etc/bitwarden/core mkdir -p /etc/bitwarden/core
mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/logs
mkdir -p /etc/bitwarden/ca-certificates
chown -R $USERNAME:$USERNAME /etc/bitwarden chown -R $USERNAME:$USERNAME /etc/bitwarden
env >> /etc/environment env >> /etc/environment
cron cron
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates
gosu bitwarden:bitwarden dotnet /app/Api.dll gosu bitwarden:bitwarden dotnet /app/Api.dll

4
src/Identity/entrypoint.sh
View File

@ -21,9 +21,13 @@ fi
mkdir -p /etc/bitwarden/identity mkdir -p /etc/bitwarden/identity
mkdir -p /etc/bitwarden/core mkdir -p /etc/bitwarden/core
mkdir -p /etc/bitwarden/logs mkdir -p /etc/bitwarden/logs
mkdir -p /etc/bitwarden/ca-certificates
chown -R $USERNAME:$USERNAME /etc/bitwarden chown -R $USERNAME:$USERNAME /etc/bitwarden
cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx cp /etc/bitwarden/identity/identity.pfx /app/identity.pfx
chown -R $USERNAME:$USERNAME /app chown -R $USERNAME:$USERNAME /app
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates
gosu $USERNAME:$USERNAME dotnet /app/Identity.dll gosu $USERNAME:$USERNAME dotnet /app/Identity.dll

2
util/Setup/DockerComposeBuilder.cs
View File

@ -148,6 +148,7 @@ services:
restart: always restart: always
volumes: volumes:
- ../core:/etc/bitwarden/core - ../core:/etc/bitwarden/core
- ../ca-certificates:/etc/bitwarden/ca-certificates
- ../logs/api:/etc/bitwarden/logs - ../logs/api:/etc/bitwarden/logs
env_file: env_file:
- global.env - global.env
@ -161,6 +162,7 @@ services:
volumes: volumes:
- ../identity:/etc/bitwarden/identity - ../identity:/etc/bitwarden/identity
- ../core:/etc/bitwarden/core - ../core:/etc/bitwarden/core
- ../ca-certificates:/etc/bitwarden/ca-certificates
- ../logs/identity:/etc/bitwarden/logs - ../logs/identity:/etc/bitwarden/logs
env_file: env_file:
- global.env - global.env