Merge branch 'dev/v1.0.x' into fix-cli-json-parsing-failure

briababby · Oct 4, 2020 · 89a6fda · 89a6fda
2 parents c2d2b58 + 6543736
commit 89a6fda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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

diff --git 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