mirror of
https://github.com/jakeswenson/BitBetter.git
synced 2025-12-16 11:16:19 +00:00
Update container name/links of Bitwarden Unified to Bitwarden Lite (#265)
* Rename Containers from bitwarden/self-host:beta to bitwarden/lite:beta * Edit README to reflect rename * Change build.ps1 and Dockerfile-bitwarden-patched to CRLF * Remove .DS_Store file, and add to .gitignore * Actually remove .DS_Store * Make all ps1 files CRLF in .gitattributes & Make Dockerfiles LF. * Change from beta tag to latest
This commit is contained in:
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
*.ps1 text eol=crlf
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,3 +9,4 @@ src/bitBetter/.vs/*
|
|||||||
*.pfx
|
*.pfx
|
||||||
*.cer
|
*.cer
|
||||||
*.vsidx
|
*.vsidx
|
||||||
|
.DS_Store
|
||||||
|
|||||||
@@ -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 `ghcr.io/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/lite` 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 `ghcr.io/bitwarden/self-host` image called `bitwarden-patched`.
|
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/lite` image called `bitwarden-patched`.
|
||||||
|
|
||||||
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.**
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@ If you ran the build script, you can **simply run the license gen in interactive
|
|||||||
|
|
||||||
## Migrating from mssql to a real database
|
## Migrating from mssql to a real database
|
||||||
|
|
||||||
Prepare a new database and bwdata directory, download and prepare the new settings.env (https://raw.githubusercontent.com/bitwarden/self-host/refs/heads/main/docker-unified/settings.env)
|
Prepare a new database and bwdata directory, download and prepare the new settings.env (https://raw.githubusercontent.com/bitwarden/self-host/refs/heads/main/bitwarden-lite/settings.env)
|
||||||
|
|
||||||
Make sure you can get the data from either the backup file or by connecting directly to the mssql database (navicat has a trial).
|
Make sure you can get the data from either the backup file or by connecting directly to the mssql database (navicat has a trial).
|
||||||
|
|
||||||
|
|||||||
@@ -53,11 +53,11 @@ foreach ($instance in $oldinstances) {
|
|||||||
|
|
||||||
# update bitwarden itself
|
# update bitwarden itself
|
||||||
if ($args[0] -eq 'update') {
|
if ($args[0] -eq 'update') {
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
} else {
|
} else {
|
||||||
$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
|
$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
|
||||||
if ($confirmation -eq 'y') {
|
if ($confirmation -eq 'y') {
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ foreach ($instance in $oldinstances) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# 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-extract ghcr.io/bitwarden/self-host:beta
|
$patchinstance = docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest
|
||||||
|
|
||||||
# create our temporary directory
|
# create our temporary directory
|
||||||
New-item -ItemType Directory -Path $tempdirectory
|
New-item -ItemType Directory -Path $tempdirectory
|
||||||
|
|||||||
6
build.sh
6
build.sh
@@ -54,11 +54,11 @@ done
|
|||||||
|
|
||||||
# update bitwarden itself
|
# update bitwarden itself
|
||||||
if [ "$1" = "update" ]; then
|
if [ "$1" = "update" ]; then
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
else
|
else
|
||||||
read -p "Update (or get) bitwarden source container (y/n): "
|
read -p "Update (or get) bitwarden source container (y/n): "
|
||||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||||
docker pull ghcr.io/bitwarden/self-host:beta
|
docker pull ghcr.io/bitwarden/lite:latest
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ for INSTANCE in ${OLDINSTANCES[@]}; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
# 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-extract ghcr.io/bitwarden/self-host:beta)
|
PATCHINSTANCE=$(docker run -d --name bitwarden-extract ghcr.io/bitwarden/lite:latest)
|
||||||
|
|
||||||
# create our temporary directory
|
# create our temporary directory
|
||||||
mkdir $TEMPDIRECTORY
|
mkdir $TEMPDIRECTORY
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
FROM ghcr.io/bitwarden/self-host:beta
|
FROM ghcr.io/bitwarden/lite:latest
|
||||||
|
|
||||||
COPY ./temp/ /app/
|
COPY ./temp/ /app/
|
||||||
Reference in New Issue
Block a user