other/BitBetter
1
0
Fork 0
mirror of https://github.com/jakeswenson/BitBetter.git synced 2025-10-16 21:43:27 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: other:d03ae54dd68a5b4e2e9f0c5c2230629a46d4d3d1
Branches Tags
other:master
other:unified
...
compare: other:3566d2c6aea0c5f97ef0d579a9532bca9890d6a6
Branches Tags
other:master
other:unified

3 Commits
d03ae54dd6 ... 3566d2c6ae

Author SHA1 Message Date
Michiel Hazelhof
3566d2c6ae
Merge a6516572f6 into 29add24126 2025-08-22 13:15:04 +03:00
Michiel Hazelhof
a6516572f6
Improve consistency between bash and powerhell 2025-08-22 10:41:30 +02:00
Michiel Hazelhof
29883a60f6
Update comment 2025-08-21 10:38:03 +02:00
2 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

3
build.ps1
View File

@ -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" Rename-Item -Path "$pwd\.keys\cert.cert" -NewName "$pwd\.keys\cert.cer"
} }
# generate keys if none are available # generate keys if none are available
if (!(Test-Path "$pwd\.keys" -PathType Container)) { if (!(Test-Path "$pwd\.keys" -PathType Container)) {
.\generateKeys.ps1 .\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" docker build --no-cache -t bitbetter/bitbetter "$pwd\src\bitBetter"
Remove-Item "$pwd\src\bitBetter\cert.cer" -Force 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}}' $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
# stop and remove all running instances # stop and remove all running instances

8
build.sh
View File

@ -40,7 +40,7 @@ cp -f "$PWD/.keys/cert.cer" "$PWD/src/bitBetter"
docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter" docker build --no-cache -t bitbetter/bitbetter "$PWD/src/bitBetter"
rm -f "$PWD/src/bitBetter/cert.cer" 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}}') OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
# stop and remove all running instances # stop and remove all running instances
@ -53,10 +53,8 @@ done
if [ "$1" = "update" ]; then if [ "$1" = "update" ]; then
docker pull ghcr.io/bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
else else
read -p "Update (or get) bitwarden source container (y/n): " -n 1 -r read -p "Update (or get) bitwarden source container (y/n): "
echo if [[ $REPLY =~ ^[Yy]$ ]]; then
if [[ $REPLY =~ ^[Yy]$ ]]
then
docker pull ghcr.io/bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
fi fi
fi fi