From 1c4a27bfaabf1bf942adc44bfbcd48ad5755209b Mon Sep 17 00:00:00 2001
From: Reuven Podmazo <reuven@enigma.co>
Date: Wed, 30 Sep 2020 19:08:27 +0300
Subject: [PATCH 1/3] replaced `git branch --show-current` with `git rev-parse
 --abbrev-ref HEAD`

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 51378ae8c..3c1f60aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
 VERSION ?= $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
-CURRENT_BRANCH := $(shell git branch --show-current)
+CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 LEDGER_ENABLED ?= true
 BINDIR ?= $(GOPATH)/bin
 BUILD_PROFILE ?= release
@@ -339,7 +339,7 @@ build-all-test-contracts: build-test-contract
 bin-data: bin-data-sw bin-data-develop bin-data-production
 
 bin-data-sw:
-	cd ./cmd/secretd && go-bindata -o ias_bin_sw.go -prefix "../../ias_keys/sw_dummy/" -tags "!hw" ../../ias_keys/sw_dummy/...
+	cd ./cmd/secretd && pwd && go-bindata -o ias_bin_sw.go -prefix "../../ias_keys/sw_dummy/" -tags "!hw" ../../ias_keys/sw_dummy/...
 
 bin-data-develop:
 	cd ./cmd/secretd && go-bindata -o ias_bin_dev.go -prefix "../../ias_keys/develop/" -tags "develop,hw" ../../ias_keys/develop/...

From f8b38484e3fd726f4ca33a305ecbbc433fcedf6e Mon Sep 17 00:00:00 2001
From: Reuven Podmazo <reuven@enigma.co>
Date: Wed, 30 Sep 2020 19:09:03 +0300
Subject: [PATCH 2/3] added copying of sw keys to base.Dockerfile

---
 deployment/dockerfiles/base.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/deployment/dockerfiles/base.Dockerfile b/deployment/dockerfiles/base.Dockerfile
index a6b13b8bf..573068127 100644
--- a/deployment/dockerfiles/base.Dockerfile
+++ b/deployment/dockerfiles/base.Dockerfile
@@ -44,6 +44,8 @@ COPY api_key.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/develop/
 COPY spid.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/develop/
 COPY api_key.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/production/
 COPY spid.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/production/
+COPY api_key.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/sw_dummy/
+COPY spid.txt /go/src/github.com/enigmampc/SecretNetwork/ias_keys/sw_dummy/
 
 RUN . /opt/sgxsdk/environment && env && MITIGATION_CVE_2020_0551=LOAD VERSION=${VERSION} FEATURES=${FEATURES} SGX_MODE=${SGX_MODE} make build-rust
 

From 1e5b8dcdf89638d9e54261375f5180c5356fea9f Mon Sep 17 00:00:00 2001
From: Reuven Podmazo <reuven@enigma.co>
Date: Wed, 30 Sep 2020 19:19:04 +0300
Subject: [PATCH 3/3] removed debug `pwd`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3c1f60aa0..37f2bcd48 100644
--- a/Makefile
+++ b/Makefile
@@ -339,7 +339,7 @@ build-all-test-contracts: build-test-contract
 bin-data: bin-data-sw bin-data-develop bin-data-production
 
 bin-data-sw:
-	cd ./cmd/secretd && pwd && go-bindata -o ias_bin_sw.go -prefix "../../ias_keys/sw_dummy/" -tags "!hw" ../../ias_keys/sw_dummy/...
+	cd ./cmd/secretd && go-bindata -o ias_bin_sw.go -prefix "../../ias_keys/sw_dummy/" -tags "!hw" ../../ias_keys/sw_dummy/...
 
 bin-data-develop:
 	cd ./cmd/secretd && go-bindata -o ias_bin_dev.go -prefix "../../ias_keys/develop/" -tags "develop,hw" ../../ias_keys/develop/...