other/BitBetter
1
0
Fork 0
mirror of https://github.com/jakeswenson/BitBetter.git synced 2025-05-24 06:23:27 +00:00
Code Issues Projects Releases Wiki Activity

Update Unified branch to account for move from Docker Hub to GHCR (#227)

Browse Source 
* Update build.sh to reflect move to GHCR

* Update build.ps1 to reflect move to GHCR

* Update README.md to reflect move to GHCR

* Update Dockerfile-bitwarden-patch to reflect move to GHCR
This commit is contained in:
Joseph Gigantino 2025-03-29 13:15:16 -04:00 committed by GitHub
parent 770dcd33f6
commit d71aa84e52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -63,14 +63,14 @@ The scripts supports running and patching multi instances.
Edit the .servers/serverlist.txt file and fill in the missing values, they can be replaced with existing installation values. Edit the .servers/serverlist.txt file and fill in the missing values, they can be replaced with existing installation values.
This file may be empty, but there will be no containers will be spun up automatically. This file may be empty, but there will be no containers will be spun up automatically.
Now it is time to **run the main build script** to generate a modified version of the `bitwarden/self-host` docker image and the license generator. Now it is time to **run the main build script** to generate a modified version of the `ghcr.io/bitwarden/self-host` docker image and the license generator.
From the BitBetter directory, simply run: From the BitBetter directory, simply run:
``` ```
./build.[sh|ps1] ./build.[sh|ps1]
``` ```
This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `bitwarden/self-host` image called `bitwarden-patch`. This will create a new self-signed certificate in the `.keys` directory if one does not already exist and then create a modified version of the official `ghcr.io/bitwarden/self-host` image called `bitwarden-patch`.
Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.** Afterwards it will automatically generate the license generator and start all previously specified containers which are **now ready to accept self-issued licenses.**

6
build.ps1
View File

@ -45,13 +45,13 @@ foreach ($instance in $oldinstances) {
# update bitwarden itself # update bitwarden itself
if ($args[0] -eq 'y') if ($args[0] -eq 'y')
{ {
docker pull bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
} }
else else
{ {
$confirmation = Read-Host "Update (or get) bitwarden source container" $confirmation = Read-Host "Update (or get) bitwarden source container"
if ($confirmation -eq 'y') { if ($confirmation -eq 'y') {
docker pull bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
} }
} }
@ -61,7 +61,7 @@ docker rm bitwarden-patch
docker image rm bitwarden-patch docker image rm bitwarden-patch
# start a new bitwarden instance so we can patch it # start a new bitwarden instance so we can patch it
$patchinstance = docker run -d --name bitwarden-patch bitwarden/self-host:beta $patchinstance = docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta
# create our temporary directory # create our temporary directory
New-item -ItemType Directory -Path $tempdirectory New-item -ItemType Directory -Path $tempdirectory

6
build.sh
View File

@ -47,13 +47,13 @@ done
# update bitwarden itself # update bitwarden itself
if [ "$1" = "y" ]; then if [ "$1" = "y" ]; then
docker pull bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
else else
read -p "Update (or get) bitwarden source container: " -n 1 -r read -p "Update (or get) bitwarden source container: " -n 1 -r
echo echo
if [[ $REPLY =~ ^[Yy]$ ]] if [[ $REPLY =~ ^[Yy]$ ]]
then then
docker pull bitwarden/self-host:beta docker pull ghcr.io/bitwarden/self-host:beta
fi fi
fi fi
@ -63,7 +63,7 @@ docker rm bitwarden-patch
docker image rm bitwarden-patch docker image rm bitwarden-patch
# start a new bitwarden instance so we can patch it # start a new bitwarden instance so we can patch it
PATCHINSTANCE=$(docker run -d --name bitwarden-patch bitwarden/self-host:beta) PATCHINSTANCE=$(docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta)
# create our temporary directory # create our temporary directory
mkdir $TEMPDIRECTORY mkdir $TEMPDIRECTORY

2
src/bitBetter/Dockerfile-bitwarden-patch
View File

@ -1,4 +1,4 @@
FROM bitwarden/self-host:beta FROM ghcr.io/bitwarden/self-host:beta
COPY ./temp/Api/Core.dll /app/Api/Core.dll COPY ./temp/Api/Core.dll /app/Api/Core.dll
COPY ./temp/Identity/Core.dll /app/Identity/Core.dll COPY ./temp/Identity/Core.dll /app/Identity/Core.dll