From 1774a25de81417dead714007bfad1b4c7c22a315 Mon Sep 17 00:00:00 2001 From: Tatsuya Sato Date: Fri, 14 Jun 2019 22:41:59 +0000 Subject: [PATCH] [FAB-15723] Fix script and instruction with ccenv This patch fixes the script and instruction with the ccenv container. Running chaincode dev-mode fails because bash was removed from the ccenv by FAB-15670. This patch changes the command from /bin/bash to /bin/sh. FAB-15723 #done Change-Id: Ibf31ce9170e606988302bf46d8dac98b62e2043e Signed-off-by: Tatsuya Sato --- chaincode-docker-devmode/README.rst | 10 +++++----- chaincode-docker-devmode/docker-compose-simple.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chaincode-docker-devmode/README.rst b/chaincode-docker-devmode/README.rst index aa57190b7f..d65011257c 100644 --- a/chaincode-docker-devmode/README.rst +++ b/chaincode-docker-devmode/README.rst @@ -74,24 +74,24 @@ Terminal 2 - Build & start the chaincode .. code:: bash - docker exec -it chaincode bash + docker exec -it chaincode sh You should see the following: -.. code:: bash +.. code:: sh - root@d2629980e76b:/opt/gopath/src/chaincode# + /opt/gopath/src/chaincode $ Now, compile your chaincode: -.. code:: bash +.. code:: sh cd abstore/go go build -o abstore Now run the chaincode: -.. code:: bash +.. code:: sh CORE_PEER_ADDRESS=peer:7052 CORE_CHAINCODE_ID_NAME=mycc:0 ./abstore diff --git a/chaincode-docker-devmode/docker-compose-simple.yaml b/chaincode-docker-devmode/docker-compose-simple.yaml index b5b94e0294..db46c56a5d 100644 --- a/chaincode-docker-devmode/docker-compose-simple.yaml +++ b/chaincode-docker-devmode/docker-compose-simple.yaml @@ -77,7 +77,7 @@ services: - CORE_PEER_LOCALMSPID=DEFAULT - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp working_dir: /opt/gopath/src/chaincode - command: /bin/bash -c 'sleep 6000000' + command: /bin/sh -c 'sleep 6000000' volumes: - /var/run/:/host/var/run/ - ./msp:/etc/hyperledger/msp