From d96cfdf485c291fe7b92433a10724223f5d9af96 Mon Sep 17 00:00:00 2001
From: vrx00 <106933224+vrx00@users.noreply.github.com>
Date: Sun, 16 Oct 2022 01:36:31 +0200
Subject: [PATCH] serai Dockerfile & Makefile fixed

---
 deploy/kubernetes/Makefile | 20 ++++++++++----------
 deploy/serai/Dockerfile    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile
index f2c40572..9889b071 100644
--- a/deploy/kubernetes/Makefile
+++ b/deploy/kubernetes/Makefile
@@ -21,46 +21,46 @@ deploy-base:
 	@docker compose -f ../docker-compose.yml --profile base build --quiet
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-base charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-base,nameOverride=serai-base,\
-	 image.envVariables[1].value=base,configMapFile=%
+	image.envVariables[1].value=base,configMapFile=%
 
 deploy-bitcoin:
 	@docker compose -f ../docker-compose.yml --profile bitcoin build --quiet
 	@(cat ../coins/bitcoin/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install bitcoin-daemon\
-	charts/bitcoin/ --values charts/bitcoin/values.yaml --set configMapFile=%
+	 charts/bitcoin/ --values charts/bitcoin/values.yaml --set configMapFile=%
 	
 deploy-ethereum:
 	@docker compose -f ../docker-compose.yml --profile ethereum build --quiet
 	@(cat ../coins/ethereum/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install ethereum-daemon\
-	charts/ethereum/ --values charts/ethereum/values.yaml --set configMapFile=%
+	 charts/ethereum/ --values charts/ethereum/values.yaml --set configMapFile=%
 	
 deploy-monero:
 	@docker compose -f ../docker-compose.yml --profile monero build --quiet
 	@(cat ../coins/monero/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install monero-daemon\
-	charts/monero/ --values charts/monero/values.yaml --set configMapFile=%
+	 charts/monero/ --values charts/monero/values.yaml --set configMapFile=%
 
 deploy-cluster-sm:
 	@docker compose -f ../docker-compose.yml --profile cluster-sm build --quiet
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-alice charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-alice,nameOverride=serai-alice,\
-	 image.envVariables[1].value=Alice,image.envVariables[2].value="'1'",configMapFile=%
+	image.envVariables[1].value=Alice,image.envVariables[2].value="'1'",configMapFile=%
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-charlie charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-charlie,nameOverride=serai-charlie,\
-	 image.envVariables[1].value=Charlie,configMapFile=%
+	image.envVariables[1].value=Charlie,configMapFile=%
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-bob charts/serai/\
-	--values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-bob,nameOverride=serai-bob,\
+	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-bob,nameOverride=serai-bob,\
 	image.envVariables[1].value=Bob,configMapFile=%
 
 deploy-cluster-lg: deploy-cluster-sm
 	@docker compose -f ../docker-compose.yml --profile cluster-lg build --quiet
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-dave charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-dave,nameOverride=serai-dave,\
-	 image.envVariables[1].value=Dave,configMapFile=%
+	image.envVariables[1].value=Dave,configMapFile=%
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-eve charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-eve,nameOverride=serai-eve,\
-	 image.envVariables[1].value=Eve,configMapFile=%
+	image.envVariables[1].value=Eve,configMapFile=%
 	@(cat ../serai/scripts/entry-dev.sh | base64 -w 0 -) | xargs -I % helm upgrade --install serai-ferdie charts/serai/\
 	 --values charts/serai/values.yaml --set image.envVariablesfullnameOverride=serai-ferdie,nameOverride=serai-ferdie,\
-	 image.envVariables[1].value=Ferdie,configMapFile=%
+	image.envVariables[1].value=Ferdie,configMapFile=%
 	
 deploy-coins: deploy-bitcoin deploy-ethereum deploy-monero
 
diff --git a/deploy/serai/Dockerfile b/deploy/serai/Dockerfile
index 3c07e172..2e941724 100644
--- a/deploy/serai/Dockerfile
+++ b/deploy/serai/Dockerfile
@@ -16,7 +16,7 @@ WORKDIR /serai
 RUN rustup update
 
 # Install Solc @ 0.8.16
-RUN pip3 install solc-select
+RUN pip3 install solc-select==0.2.1
 RUN solc-select install 0.8.16
 RUN solc-select use 0.8.16