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

win no longer requires mssql volume

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-02 14:49:42 -04:00
parent 4cad4a116e
commit 27fcd9c58f
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
docker/docker-compose.linux.yml → docker/docker-compose.linwin.yml
View File

0
docker/docker-compose.macwin.yml → docker/docker-compose.mac.yml
View File

2
scripts/bitwarden.ps1
View File

@ -69,7 +69,7 @@ function Download-Run-File {
function Download-Docker-Files { function Download-Docker-Files {
Invoke-RestMethod -OutFile $dockerDir\docker-compose.yml -Uri "${githubBaseUrl}/docker/docker-compose.yml" Invoke-RestMethod -OutFile $dockerDir\docker-compose.yml -Uri "${githubBaseUrl}/docker/docker-compose.yml"
Invoke-RestMethod -OutFile $dockerDir\docker-compose.macwin.yml ` -Uri "${githubBaseUrl}/docker/docker-compose.macwin.yml" Invoke-RestMethod -OutFile $dockerDir\docker-compose.linwin.yml ` -Uri "${githubBaseUrl}/docker/docker-compose.linwin.yml"
Invoke-RestMethod -OutFile $dockerDir\global.env -Uri "${githubBaseUrl}/docker/global.env" Invoke-RestMethod -OutFile $dockerDir\global.env -Uri "${githubBaseUrl}/docker/global.env"
Invoke-RestMethod -OutFile $dockerDir\mssql.env -Uri "${githubBaseUrl}/docker/mssql.env" Invoke-RestMethod -OutFile $dockerDir\mssql.env -Uri "${githubBaseUrl}/docker/mssql.env"
} }

4
scripts/bitwarden.sh
View File

@ -35,10 +35,10 @@ then
OUTPUT=$2 OUTPUT=$2
fi fi
OS="linux" OS="linwin"
if [ "$(uname)" == "Darwin" ] if [ "$(uname)" == "Darwin" ]
then then
OS="macwin" OS="mac"
fi fi
SCRIPTS_DIR="$OUTPUT/scripts" SCRIPTS_DIR="$OUTPUT/scripts"

6
scripts/run.ps1
View File

@ -18,15 +18,15 @@ if($dockerDir -eq "") {
# Functions # Functions
function Docker-Compose-Up { function Docker-Compose-Up {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml up -d docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml up -d
} }
function Docker-Compose-Down { function Docker-Compose-Down {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml down docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml down
} }
function Docker-Compose-Pull { function Docker-Compose-Pull {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.macwin.yml pull docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.linwin.yml pull
} }
function Docker-Prune { function Docker-Prune {

4
scripts/run.sh
View File

@ -17,10 +17,10 @@ then
DOCKER_DIR=$3 DOCKER_DIR=$3
fi fi
OS="linux" OS="linwin"
if [ "$(uname)" == "Darwin" ] if [ "$(uname)" == "Darwin" ]
then then
OS="macwin" OS="mac"
fi fi
# Functions # Functions