Merge "[FAB-13752] Cleanup Docker related infrastructure"

hyperledger · Feb 12, 2019 · 2c2f333 · 2c2f333
2 parents 442eea6 + 519c315
commit 2c2f333
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/docker-env.mk b/docker-env.mk
@@ -49,17 +49,9 @@ BASE_DOCKER_TAG=$(ARCH)-$(BASEIMAGE_RELEASE)
 
 DOCKER_NS ?= hyperledger
 DOCKER_TAG=$(ARCH)-$(PROJECT_VERSION)
-PREV_TAG=$(ARCH)-$(PREV_VERSION)
 
 BASE_DOCKER_LABEL=org.hyperledger.fabric
 
-DOCKER_DYNAMIC_LINK ?= false
-DOCKER_GO_LDFLAGS += $(GO_LDFLAGS)
-
-ifeq ($(DOCKER_DYNAMIC_LINK),false)
-DOCKER_GO_LDFLAGS += -linkmode external -extldflags '-static -lpthread'
-endif
-
 #
 # What is a .dummy file?
 #