From d71aa84e5273f3e3b39e64d2d90f3e5fb65a1a96 Mon Sep 17 00:00:00 2001
From: Joseph Gigantino <128943406+Jgigantino31@users.noreply.github.com>
Date: Sat, 29 Mar 2025 13:15:16 -0400
Subject: [PATCH] Update Unified branch to account for move from Docker Hub to
 GHCR (#227)

* 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
---
 README.md                                | 4 ++--
 build.ps1                                | 8 ++++----
 build.sh                                 | 8 ++++----
 src/bitBetter/Dockerfile-bitwarden-patch | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1165535..6890eee 100644
--- a/README.md
+++ b/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 `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:
 ```
 ./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.**
 
diff --git a/build.ps1 b/build.ps1
index 37c1c48..54f6f6b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -45,13 +45,13 @@ foreach ($instance in $oldinstances) {
 # update bitwarden itself
 if ($args[0] -eq 'y')
 {
-	docker pull bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/self-host:beta
 }
 else
 {
 	$confirmation = Read-Host "Update (or get) bitwarden source container"
 	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
 
 # 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
 New-item -ItemType Directory -Path $tempdirectory
@@ -101,4 +101,4 @@ docker build -t bitbetter/licensegen "$pwd\src\licenseGen"
 
 # clean the licenseGen source directory
 Remove-Item "$pwd\src\licenseGen\Core.dll" -Force
-Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
\ No newline at end of file
+Remove-Item "$pwd\src\licenseGen\cert.pfx" -Force
diff --git a/build.sh b/build.sh
index 2be0c79..255e1d8 100755
--- a/build.sh
+++ b/build.sh
@@ -47,13 +47,13 @@ done
 
 # update bitwarden itself
 if [ "$1" = "y" ]; then
-	docker pull bitwarden/self-host:beta
+	docker pull ghcr.io/bitwarden/self-host:beta
 else
 	read -p "Update (or get) bitwarden source container: " -n 1 -r
 	echo
 	if [[ $REPLY =~ ^[Yy]$ ]]
 	then
-		docker pull bitwarden/self-host:beta
+		docker pull ghcr.io/bitwarden/self-host:beta
 	fi
 fi
 
@@ -63,7 +63,7 @@ docker rm bitwarden-patch
 docker image rm bitwarden-patch
 
 # 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
 mkdir $TEMPDIRECTORY
@@ -103,4 +103,4 @@ docker build -t bitbetter/licensegen "$PWD/src/licenseGen"
 
 # clean the licenseGen source directory
 rm -f "$PWD/src/licenseGen/Core.dll"
-rm -f "$PWD/src/licenseGen/cert.pfx"
\ No newline at end of file
+rm -f "$PWD/src/licenseGen/cert.pfx"
diff --git a/src/bitBetter/Dockerfile-bitwarden-patch b/src/bitBetter/Dockerfile-bitwarden-patch
index cd443b5..c99e2df 100644
--- a/src/bitBetter/Dockerfile-bitwarden-patch
+++ b/src/bitBetter/Dockerfile-bitwarden-patch
@@ -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/Identity/Core.dll /app/Identity/Core.dll
\ No newline at end of file
+COPY ./temp/Identity/Core.dll /app/Identity/Core.dll