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

Allow usage of default override file (#210)

Browse Source 
* Updated run.sh to support default override

This is equivalent to run docker-compose in the directory of the project (here "docker"). See: https://docs.docker.com/compose/extends/

Override allows to change some paramaters and extend the original compose file to your own environment (network config, CPU/RAM caps,...)

* Updated run.ps1 to support docker override file

Same as run.sh

* Added conditionals for override file absence

I misunderstood the documentation, that file must exist if file is specified on command line, added conditionals to support that case

* Update run.ps1 to test for override file presence

Same as .sh
This commit is contained in:
François Van Ingelgom 2018-02-20 17:09:47 +01:00 committed by Kyle Spearrin
parent 5a9923092a
commit fefda383d1
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/run.ps1
View File

@ -17,15 +17,31 @@ $dockerDir="${outputDir}\docker"
# Functions # Functions
function Docker-Compose-Up { function Docker-Compose-Up {
docker-compose -f ${dockerDir}\docker-compose.yml up -d if(Test-Path -Path "${dockerDir}\docker-compose.override.yml" -PathType leaf) {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.override.yml up -d
}
else {
docker-compose -f ${dockerDir}\docker-compose.yml up -d
}
} }
function Docker-Compose-Down { function Docker-Compose-Down {
docker-compose -f ${dockerDir}\docker-compose.yml down if(Test-Path -Path "${dockerDir}\docker-compose.override.yml" -PathType leaf) {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.override.yml down
}
else {
docker-compose -f ${dockerDir}\docker-compose.yml down
}
} }
function Docker-Compose-Pull { function Docker-Compose-Pull {
docker-compose -f ${dockerDir}\docker-compose.yml pull if(Test-Path -Path "${dockerDir}\docker-compose.override.yml" -PathType leaf) {
docker-compose -f ${dockerDir}\docker-compose.yml -f ${dockerDir}\docker-compose.override.yml pull
}
else {
docker-compose -f ${dockerDir}\docker-compose.yml pull
}
} }
function Docker-Prune { function Docker-Prune {

21
scripts/run.sh
View File

@ -34,15 +34,30 @@ DOCKER_DIR="$OUTPUT_DIR/docker"
# Functions # Functions
function dockerComposeUp() { function dockerComposeUp() {
docker-compose -f $DOCKER_DIR/docker-compose.yml up -d if [ -f "$DOCKER_DIR/docker-compose.override.yml" ]
then
docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.override.yml up -d
else
docker-compose -f $DOCKER_DIR/docker-compose.yml up -d
fi
} }
function dockerComposeDown() { function dockerComposeDown() {
docker-compose -f $DOCKER_DIR/docker-compose.yml down if [ -f "$DOCKER_DIR/docker-compose.override.yml" ]
then
docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.override.yml down
else
docker-compose -f $DOCKER_DIR/docker-compose.yml down
fi
} }
function dockerComposePull() { function dockerComposePull() {
docker-compose -f $DOCKER_DIR/docker-compose.yml pull if [ -f "$DOCKER_DIR/docker-compose.override.yml" ]
then
docker-compose -f $DOCKER_DIR/docker-compose.yml -f $DOCKER_DIR/docker-compose.override.yml pull
else
docker-compose -f $DOCKER_DIR/docker-compose.yml pull
fi
} }
function dockerPrune() { function dockerPrune() {