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

Get container name from docker-compose.override.yml (#571)

Browse Source 
* Update run.sh

* Much more generic version

* Typo

* Windows version
This commit is contained in:
Mart124 2019-10-02 16:20:33 +02:00 committed by Kyle Spearrin
parent 904c29809b
commit 003a0802a7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/run.ps1
View File

@ -115,7 +115,9 @@ function Update-Lets-Encrypt {
function Update-Database { function Update-Database {
Pull-Setup Pull-Setup
docker run -it --rm --name setup --network container:bitwarden-mssql ` Docker-Compose-Files
$mssqlId = docker-compose ps -q mssql
docker run -it --rm --name setup --network container:$mssqlId `
-v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion ` -v ${outputDir}:/bitwarden bitwarden/setup:$coreVersion `
dotnet Setup.dll -update 1 -db 1 -os win -corev $coreVersion -webv $webVersion -q $setupQuiet dotnet Setup.dll -update 1 -db 1 -os win -corev $coreVersion -webv $webVersion -q $setupQuiet
Write-Line "Database update complete" Write-Line "Database update complete"

4
scripts/run.sh
View File

@ -140,7 +140,9 @@ function updateLetsEncrypt() {
function updateDatabase() { function updateDatabase() {
pullSetup pullSetup
docker run -i --rm --name setup --network container:bitwarden-mssql \ dockerComposeFiles
MSSQL_ID=$(docker-compose ps -q mssql)
docker run -i --rm --name setup --network container:$MSSQL_ID \
-v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \ -v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
echo "Database update complete" echo "Database update complete"