Merge fff2b4294d into 9bc010cb57

.gitignore

@@ -9,3 +9,4 @@ src/bitBetter/.vs/*
 *.pfx
 *.cer
 *.vsidx
+.DS_Store

README.md

@@ -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.
 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:
 ```
 ./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.**
 
@@ -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
 
-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).
 
@@ -160,4 +160,4 @@ Require a recreation of the docker container, build.sh will suffice too.
 
 <a name="#f1"><sup>1</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.
 
-<a name="#f2"><sup>2</sup></a> If you wish to change this you'll need to change the value that `licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.
+<a name="#f2"><sup>2</sup></a> If you wish to change this you'll need to change the value that `licenseGen/Program.cs` uses for its `GenerateUserLicense` and `GenerateOrgLicense` calls. Remember, this is really unnecessary as this certificate does not represent any type of security-related certificate.

build.ps1

@@ -53,11 +53,11 @@ foreach ($instance in $oldinstances) {
 
 # update bitwarden itself
 if ($args[0] -eq 'update') {
-	docker pull ghcr.io/bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/lite:beta
 } else {
 	$confirmation = Read-Host "Update (or get) bitwarden source container (y/n)"
 	if ($confirmation -eq 'y') {
-		docker pull ghcr.io/bitwarden/self-host:beta
+		docker pull ghcr.io/bitwarden/lite:beta
 	}
 }
 
@@ -80,7 +80,7 @@ foreach ($instance in $oldinstances) {
 }
 
 # 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:beta
 
 # create our temporary directory
 New-item -ItemType Directory -Path $tempdirectory
@@ -125,4 +125,4 @@ Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
 Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
 
 # remove our temporary directory
-Remove-Item "$tempdirectory" -Recurse -Force
+Remove-Item "$tempdirectory" -Recurse -Force

build.sh

@@ -54,11 +54,11 @@ done
 
 # update bitwarden itself
 if [ "$1" = "update" ]; then
-	docker pull ghcr.io/bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/lite:beta
 else
 	read -p "Update (or get) bitwarden source container (y/n): "
 	if [[ $REPLY =~ ^[Yy]$ ]]; then
-		docker pull ghcr.io/bitwarden/self-host:beta
+		docker pull ghcr.io/bitwarden/lite:beta
 	fi
 fi
 
@@ -81,7 +81,7 @@ for INSTANCE in ${OLDINSTANCES[@]}; do
 done
 
 # 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:beta)
 
 # create our temporary directory
 mkdir $TEMPDIRECTORY
@@ -128,4 +128,4 @@ rm -f "$PWD/src/licenseGen/Core.dll"
 rm -f "$PWD/src/licenseGen/cert.pfx"
 
 # remove our temporary directory
-rm -rf "$TEMPDIRECTORY"
+rm -rf "$TEMPDIRECTORY"

licenseGen.ps1

@@ -1,17 +1,17 @@
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-if ($($args.Count) -lt 1) {
-    echo "USAGE: <License Gen action> [License Gen args...]"
-    echo "ACTIONS:"
-    echo " interactive"
-    echo " user"
-    echo " org"
-	Exit 1
-}
-
-if ($args[0] -eq "interactive") {
-    docker run -it --rm bitbetter/licensegen interactive
-} else {
-    docker run bitbetter/licensegen $args
-}
+$ErrorActionPreference = 'Stop'
+$PSNativeCommandUseErrorActionPreference = $true
+
+if ($($args.Count) -lt 1) {
+    echo "USAGE: <License Gen action> [License Gen args...]"
+    echo "ACTIONS:"
+    echo " interactive"
+    echo " user"
+    echo " org"
+	Exit 1
+}
+
+if ($args[0] -eq "interactive") {
+    docker run -it --rm bitbetter/licensegen interactive
+} else {
+    docker run bitbetter/licensegen $args
+}

src/bitBetter/Dockerfile-bitwarden-patch

@@ -1,3 +1,3 @@
-FROM ghcr.io/bitwarden/self-host:beta
+FROM ghcr.io/bitwarden/lite:beta
 
-COPY ./temp/ /app/
+COPY ./temp/ /app/