diff --git a/build.ps1 b/build.ps1 index 87aa351..b5e288e 100644 --- a/build.ps1 +++ b/build.ps1 @@ -27,7 +27,6 @@ if (Test-Path "$pwd\.keys\cert.cert" -PathType Leaf) { Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer" } - # generate keys if none are available if (!(Test-Path "$pwd\.keys" -PathType Container)) { .\generateKeys.ps1 @@ -40,7 +39,7 @@ Copy-Item "$pwd\.keys\cert.cer" -Destination "$pwd\src\bitBetter" docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter" Remove-Item "$pwd\src\bitBetter\cert.cer" -Force -# gather all running instances, cannot run a wildcard filter on Ancestor= :( +# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden* $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}' # stop and remove all running instances diff --git a/build.sh b/build.sh index bf3b0c6..3c58d72 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,7 @@ cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter" docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter" rm -f "$PWD/src/bitBetter/cert.cer" -# gather all running instances, cannot run a wildcard filter on Ancestor= :( +# gather all running instances, cannot run a wildcard filter on Ancestor= :(, does find all where name = *bitwarden* OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}') # stop and remove all running instances