Browse Source

fix: Setup is now self-contained and single-file (#376)

pull/377/head
tangowithfoxtrot 7 months ago committed by GitHub
parent
commit
9e8293e748
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      run.ps1
  2. 8
      run.sh

8
run.ps1

@ -82,7 +82,7 @@ function Install() {
Pull-Setup Pull-Setup
docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion ` docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion `
dotnet Setup.dll -install 1 -domain ${domain} -letsencrypt ${letsEncrypt} ` /app/Setup -install 1 -domain ${domain} -letsencrypt ${letsEncrypt} `
-os win -corev $coreVersion -webv $webVersion -keyconnectorv $keyConnectorVersion -q $setupQuiet -dbname "$database" -os win -corev $coreVersion -webv $webVersion -keyconnectorv $keyConnectorVersion -q $setupQuiet -dbname "$database"
} }
@ -178,7 +178,7 @@ function Update-Database {
docker run -it --rm --name setup $dockerNetworkArgs ` docker run -it --rm --name setup $dockerNetworkArgs `
-v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion ` -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion `
dotnet Setup.dll -update 1 -db 1 -os win -corev $coreVersion -webv $webVersion ` /app/Setup -update 1 -db 1 -os win -corev $coreVersion -webv $webVersion `
-keyconnectorv $keyConnectorVersion -q $setupQuiet -keyconnectorv $keyConnectorVersion -q $setupQuiet
Write-Line "Database update complete" Write-Line "Database update complete"
} }
@ -188,7 +188,7 @@ function Update([switch] $withpull) {
Pull-Setup Pull-Setup
} }
docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion ` docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion `
dotnet Setup.dll -update 1 -os win -corev $coreVersion -webv $webVersion ` /app/Setup -update 1 -os win -corev $coreVersion -webv $webVersion `
-keyconnectorv $keyConnectorVersion -q $setupQuiet -keyconnectorv $keyConnectorVersion -q $setupQuiet
} }
@ -227,7 +227,7 @@ function Uninstall() {
function Print-Environment { function Print-Environment {
Pull-Setup Pull-Setup
docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion ` docker run -it --rm --name setup -v ${outputDir}:/bitwarden ghcr.io/bitwarden/setup:$coreVersion `
dotnet Setup.dll -printenv 1 -os win -corev $coreVersion -webv $webVersion ` /app/Setup -printenv 1 -os win -corev $coreVersion -webv $webVersion `
-keyconnectorv $keyConnectorVersion -q $setupQuiet -keyconnectorv $keyConnectorVersion -q $setupQuiet
} }

8
run.sh

@ -104,7 +104,7 @@ function install() {
pullSetup pullSetup
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden \ docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden \
--env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \ --env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS \ /app/Setup -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS \
-corev $COREVERSION -webv $WEBVERSION -dbname "$DATABASE" -keyconnectorv $KEYCONNECTORVERSION -corev $COREVERSION -webv $WEBVERSION -dbname "$DATABASE" -keyconnectorv $KEYCONNECTORVERSION
} }
@ -200,7 +200,7 @@ function updateDatabase() {
docker run -i --rm --name setup $docker_network_args \ docker run -i --rm --name setup $docker_network_args \
-v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \ -v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION /app/Setup -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION
echo "Database update complete" echo "Database update complete"
} }
@ -242,7 +242,7 @@ function update() {
fi fi
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \ docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
--env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \ --env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION /app/Setup -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION
} }
function uninstall() { function uninstall() {
@ -287,7 +287,7 @@ function printEnvironment() {
pullSetup pullSetup
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \ docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
--env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \ --env-file $ENV_DIR/uid.env ghcr.io/bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION /app/Setup -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION -keyconnectorv $KEYCONNECTORVERSION
} }
function restart() { function restart() {

Loading…
Cancel
Save