Skip to content

Commit

Permalink
[FABG-727] Remove socat dependency from Makefile
Browse files Browse the repository at this point in the history
This change removes the check for socat from the Makefile.
This was accidently disabling chaincoded in the CI.

Change-Id: I035cff222422b1de0295cc0731261df502a01c17
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Aug 24, 2018
1 parent 28c91d2 commit 0cd9893
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,12 @@ endif

# Determine if use mock chaincode daemon should be used
FABRIC_SDK_ENABLE_CHAINCODED := false
ifneq ($(SOCAT_DOCKER_IMG),)
#chaincoded is currently able to intercept the docker calls without need for forwarding.
#(so reverse proxy to docker via socat is currently disabled).
#ifneq ($(SOCAT_DOCKER_IMG),)
ifeq ($(FABRIC_SDK_CHAINCODED),true)
FABRIC_SDK_ENABLE_CHAINCODED := true
endif
#endif
endif

# Setup Go Tags
Expand Down

0 comments on commit 0cd9893

Please sign in to comment.