fix error message after build (#263), improve readme (#266)

Not sure about the correct url

README.md

@@ -4,6 +4,8 @@ BitBetter is is a tool to modify Bitwarden's core dll to allow you to generate y
 
 Please see the FAQ below for details on why this software was created.
 
+Looking for a solution to the Lite (formerly unified) version of bitwarden, [go to the Lite branch](../../tree/lite).
+
 _Beware! BitBetter does janky stuff to rewrite the bitwarden core dll and allow the installation of a self signed certificate. Use at your own risk!_
 
 Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter
@@ -72,9 +74,11 @@ You may now simply create the file `/path/to/bwdata/docker/docker-compose.overri
 services:
   api:
     image: bitbetter/api
+    pull_policy: never
 
   identity:
     image: bitbetter/identity
+    pull_policy: never
 ```
 
 You'll also want to edit the `/path/to/bwdata/scripts/run.sh` file. In the `function restart()` block, comment out the call to `dockerComposePull`.

build.sh

@@ -6,6 +6,25 @@ BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersi
 
 echo "Building BitBetter for BitWarden version $BW_VERSION"
 
+# Enable BuildKit for better build experience and to ensure platform args are populated
+export DOCKER_BUILDKIT=1
+export COMPOSE_DOCKER_CLI_BUILD=1
+
+# Determine host architecture to use as default BUILDPLATFORM / TARGETPLATFORM if not supplied.
+# Allow override via environment variables when invoking the script.
+HOST_UNAME_ARCH=$(uname -m 2>/dev/null || echo unknown)
+case "$HOST_UNAME_ARCH" in
+    x86_64|amd64)   DEFAULT_ARCH=amd64 ;;
+    aarch64|arm64)  DEFAULT_ARCH=arm64 ;;
+    armv7l|armv7)   DEFAULT_ARCH=arm/v7 ;;
+    *)              DEFAULT_ARCH=amd64 ;;
+esac
+
+: "${BUILDPLATFORM:=linux/${DEFAULT_ARCH}}"
+: "${TARGETPLATFORM:=linux/${DEFAULT_ARCH}}"
+
+echo "Using BUILDPLATFORM=$BUILDPLATFORM TARGETPLATFORM=$TARGETPLATFORM"
+
 # If there aren't any keys, generate them first.
 [ -e "$DIR/.keys/cert.cert" ] || "$DIR/.keys/generate-keys.sh"
 
@@ -19,8 +38,25 @@ new_thumbprint=$(openssl x509 -inform DER -fingerprint -noout -in $DIR/.keys/cer
 sed -i -e "s/$old_thumbprint/$new_thumbprint/g" $DIR/server/src/Core/Billing/Services/Implementations/LicensingService.cs
 cp $DIR/.keys/cert.cert $DIR/server/src/Core/licensing.cer
 
-docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Api/Dockerfile -t bitbetter/api
+docker build \
-docker build --no-cache --label com.bitwarden.product="bitbetter" $DIR/server -f $DIR/server/src/Identity/Dockerfile -t bitbetter/identity
+	--no-cache \
+	--platform "$TARGETPLATFORM" \
+	--build-arg BUILDPLATFORM="$BUILDPLATFORM" \
+	--build-arg TARGETPLATFORM="$TARGETPLATFORM" \
+	--label com.bitwarden.product="bitbetter" \
+	-f $DIR/server/src/Api/Dockerfile \
+	-t bitbetter/api \
+	$DIR/server
+
+docker build \
+	--no-cache \
+	--platform "$TARGETPLATFORM" \
+	--build-arg BUILDPLATFORM="$BUILDPLATFORM" \
+	--build-arg TARGETPLATFORM="$TARGETPLATFORM" \
+	--label com.bitwarden.product="bitbetter" \
+	-f $DIR/server/src/Identity/Dockerfile \
+	-t bitbetter/identity \
+	$DIR/server
 
 docker tag bitbetter/api bitbetter/api:latest
 docker tag bitbetter/identity bitbetter/identity:latest
@@ -28,5 +64,5 @@ docker tag bitbetter/api bitbetter/api:$BW_VERSION
 docker tag bitbetter/identity bitbetter/identity:$BW_VERSION
 
 # Remove old instances of the image after a successful build.
-ids=$( docker images bitbetter/* | grep -E -v -- "CREATED|latest|${BW_VERSION}" | awk '{ print $3 }' )
+ids=$( docker image ls --format="{{ .ID }} {{ .Tag }}" 'bitbetter/*' | grep -E -v -- "CREATED|latest|${BW_VERSION}" | awk '{ ids = (ids ? ids FS $1 : $1) } END { print ids }' )
 [ -n "$ids" ] && docker rmi $ids || true

src/licenseGen/Program.cs

@@ -383,7 +383,7 @@ namespace BitwardenSelfLicensor
         {
             var core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath);
 
-            var type = core.GetType("Bit.Core.Billing.Organizations.Models.Business.OrganizationLicense");
+            var type = core.GetType("Bit.Core.Billing.Organizations.Models.OrganizationLicense");
             var licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType");
             var planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType");