From 4d4b17334499b0191577df6dc8f33a14f9e50906 Mon Sep 17 00:00:00 2001
From: Jeff Alyanak <jeff@alyanak.ca>
Date: Mon, 13 May 2019 21:13:20 -0400
Subject: [PATCH] Generate bitbetter/identiry container with modified Core.dll

Added the generation of a second modified container, bitbetter/identity, which contains the modified dll. Fixes #12.

This works on my testing environment but has not gone through extensive testing. I'd recommend a review and cleanup of this commit before it is merged into the develop or master branches.
---
 README.md                          |  4 ++--
 ReadMeInstall                      |  2 +-
 build.sh                           |  6 ++++++
 src/bitBetter/{ => api}/Dockerfile |  0
 src/bitBetter/identity/Dockerfile  | 12 ++++++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)
 rename src/bitBetter/{ => api}/Dockerfile (100%)
 create mode 100644 src/bitBetter/identity/Dockerfile

diff --git a/README.md b/README.md
index 282dcd4..9d085f2 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/B
 
 ## Building
 
-To build your own `bitwarden/api` image run
+To build your own `bitwarden/api` & `bitwarden/identity` images run
 ```bash
 ./build.sh
 ```
 
-replace anywhere `bitwarden/api` is used with `bitbetter/api` and give it a go. no promises
+In your `bwdata/docker/docker-compose.yml` replace each reference to `bitwarden/api:x.xx.x` with `bitbetter/api` and each reference to `bitwarden/identity:x.xx.x` with `bitbetter/identity` and the start bitwarden as normal.
 
 ## Issuing your own licenses
 
diff --git a/ReadMeInstall b/ReadMeInstall
index ff8b2c1..49265ed 100644
--- a/ReadMeInstall
+++ b/ReadMeInstall
@@ -79,7 +79,7 @@ cd src/licenseGen/
 
 cd ~
 
-vi ~/bwdata/docker/docker-compose.yml   -  Change image: bitwarden/api:1.26.0 to image: bitbetter/api
+vi ~/bwdata/docker/docker-compose.yml   -  Change image: bitwarden/api:1.26.0 to image: bitbetter/api and image: bitwarden/identity:x.xx.x to image: bitbetter/identity
 vi ~/bwdata/env/global.override.env    -  Enter mail__smtp relay settings
 vi ~/bwdata/scripts/run.sh   -   function restart() {   dockerComposePull to  #dockerComposePull
 
diff --git a/build.sh b/build.sh
index d3ea9ba..a2ec767 100755
--- a/build.sh
+++ b/build.sh
@@ -9,5 +9,11 @@ cd ./src/bitBetter
 dotnet restore
 dotnet publish
 
+cp -r bin/ api/
+cp -r bin/ identity/
+
+cd ./api
 docker build --pull . -t bitbetter/api # --squash
 
+cd ../identity
+docker build --pull . -t bitbetter/identity # --squash
diff --git a/src/bitBetter/Dockerfile b/src/bitBetter/api/Dockerfile
similarity index 100%
rename from src/bitBetter/Dockerfile
rename to src/bitBetter/api/Dockerfile
diff --git a/src/bitBetter/identity/Dockerfile b/src/bitBetter/identity/Dockerfile
new file mode 100644
index 0000000..b3a0324
--- /dev/null
+++ b/src/bitBetter/identity/Dockerfile
@@ -0,0 +1,12 @@
+FROM bitwarden/identity
+
+COPY bin/Debug/netcoreapp2.0/publish/* /bitBetter/
+COPY ./.keys/cert.cert /newLicensing.cer
+
+RUN dotnet /bitBetter/bitBetter.dll && \
+    echo "modified dll" && \
+    mv /app/Core.dll /app/Core.orig.dll && \
+    mv /app/modified.dll /app/Core.dll && \
+    echo "replaced dll" && \
+    rm -rf /bitBetter && rm -rf /newLicensing.cer && \
+    echo "cleaned up"