From 783bde09f1b1c8a9be0dcb09516c0964cb1c6ea8 Mon Sep 17 00:00:00 2001
From: Vinrobot <vinrobot97@gmail.com>
Date: Fri, 5 Jul 2019 21:37:21 +0200
Subject: [PATCH] Use same Dockerfile for api and identity images

---
 build.sh                           | 13 +++++--------
 src/bitBetter/{api => }/Dockerfile |  3 ++-
 src/bitBetter/identity/Dockerfile  | 10 ----------
 3 files changed, 7 insertions(+), 19 deletions(-)
 rename src/bitBetter/{api => }/Dockerfile (88%)
 delete mode 100644 src/bitBetter/identity/Dockerfile

diff --git a/build.sh b/build.sh
index 2ac9c07..629e605 100755
--- a/build.sh
+++ b/build.sh
@@ -5,16 +5,13 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # If there aren't any keys, generate them first.
 [ -e "$DIR/.keys/cert.cert" ] || "$DIR/.keys/generate-keys.sh"
 
-[ -e "$DIR/src/bitBetter/api/.keys" ]  || mkdir "$DIR/src/bitBetter/api/.keys"
-[ -e "$DIR/src/bitBetter/identity/.keys" ]  || mkdir "$DIR/src/bitBetter/identity/.keys"
+[ -e "$DIR/src/bitBetter/.keys" ] || mkdir "$DIR/src/bitBetter/.keys"
 
-cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/api/.keys"
-cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/identity/.keys"
+cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/.keys"
 
 docker run -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/core/sdk:2.1 sh build.sh
 
-cp -r "$DIR/src/bitBetter/bin" "$DIR/src/bitBetter/api/"
-cp -r "$DIR/src/bitBetter/bin" "$DIR/src/bitBetter/identity/"
+docker build --build-arg BITWARDEN_TAG=bitwarden/api -t bitbetter/api "$DIR/src/bitBetter" # --squash
+docker build --build-arg BITWARDEN_TAG=bitwarden/identity -t bitbetter/identity "$DIR/src/bitBetter" # --squash
+
 
-docker build -t bitbetter/api "$DIR/src/bitBetter/api" # --squash
-docker build -t bitbetter/identity "$DIR/src/bitBetter/identity" # --squash
diff --git a/src/bitBetter/api/Dockerfile b/src/bitBetter/Dockerfile
similarity index 88%
rename from src/bitBetter/api/Dockerfile
rename to src/bitBetter/Dockerfile
index c3ba2fc..02837cb 100644
--- a/src/bitBetter/api/Dockerfile
+++ b/src/bitBetter/Dockerfile
@@ -1,4 +1,5 @@
-FROM bitwarden/api
+ARG BITWARDEN_TAG
+FROM ${BITWARDEN_TAG}
 
 COPY bin/Debug/netcoreapp2.0/publish/* /bitBetter/
 COPY ./.keys/cert.cert /newLicensing.cer
diff --git a/src/bitBetter/identity/Dockerfile b/src/bitBetter/identity/Dockerfile
deleted file mode 100644
index 548511d..0000000
--- a/src/bitBetter/identity/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM bitwarden/identity
-
-COPY bin/Debug/netcoreapp2.0/publish/* /bitBetter/
-COPY ./.keys/cert.cert /newLicensing.cer
-
-RUN set -e; set -x; \
-    dotnet /bitBetter/bitBetter.dll && \
-    mv /app/Core.dll /app/Core.orig.dll && \
-    mv /app/modified.dll /app/Core.dll && \
-    rm -rf /bitBetter && rm -rf /newLicensing.cer