Browse Source

win no longer requires mssql volume

pull/95/head
Kyle Spearrin 8 years ago
parent
commit
27fcd9c58f
  1. 0
      docker/docker-compose.linwin.yml
  2. 0
      docker/docker-compose.mac.yml
  3. 2
      scripts/bitwarden.ps1
  4. 4
      scripts/bitwarden.sh
  5. 6
      scripts/run.ps1
  6. 4
      scripts/run.sh

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

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

2
scripts/bitwarden.ps1

@ -69,7 +69,7 @@ function Download-Run-File { @@ -69,7 +69,7 @@ function Download-Run-File {
function Download-Docker-Files {
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\mssql.env -Uri "${githubBaseUrl}/docker/mssql.env"
}

4
scripts/bitwarden.sh

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

6
scripts/run.ps1

@ -18,15 +18,15 @@ if($dockerDir -eq "") { @@ -18,15 +18,15 @@ if($dockerDir -eq "") {
# Functions
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 {
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 {
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 {

4
scripts/run.sh

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

Loading…
Cancel
Save