Skip to content

Commit 519c315

Browse files
Brett LoganBrett Logan
authored andcommitted
[FAB-13752] Cleanup Docker related infrastructure
Removed code made obsolete by recent changes to the Docker build process Change-Id: If971ea69ba5a3291afb93d408254be8c861da1cb Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
1 parent f8f0da1 commit 519c315

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

docker-env.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,9 @@ BASE_DOCKER_TAG=$(ARCH)-$(BASEIMAGE_RELEASE)
4949

5050
DOCKER_NS ?= hyperledger
5151
DOCKER_TAG=$(ARCH)-$(PROJECT_VERSION)
52-
PREV_TAG=$(ARCH)-$(PREV_VERSION)
5352

5453
BASE_DOCKER_LABEL=org.hyperledger.fabric
5554

56-
DOCKER_DYNAMIC_LINK ?= false
57-
DOCKER_GO_LDFLAGS += $(GO_LDFLAGS)
58-
59-
ifeq ($(DOCKER_DYNAMIC_LINK),false)
60-
DOCKER_GO_LDFLAGS += -linkmode external -extldflags '-static -lpthread'
61-
endif
62-
6355
#
6456
# What is a .dummy file?
6557
#

0 commit comments

Comments
 (0)