From 998a14fb4555e40704282dbb71fddf51b8a73c18 Mon Sep 17 00:00:00 2001 From: Gregory Haskins Date: Tue, 4 Apr 2017 09:47:53 -0400 Subject: [PATCH] [FAB-2984] Use testenv for CLI container Change-Id: Ia01f6dbda138ec4b576ce9fe2f2d51aa80fb7f9d Signed-off-by: Gregory Haskins --- examples/e2e_cli/docker-compose-no-tls.yaml | 2 +- examples/e2e_cli/docker-compose.yaml | 3 +-- examples/e2e_cli/end-to-end.rst | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/e2e_cli/docker-compose-no-tls.yaml b/examples/e2e_cli/docker-compose-no-tls.yaml index 4ec49186e45..3e0d9a88400 100644 --- a/examples/e2e_cli/docker-compose-no-tls.yaml +++ b/examples/e2e_cli/docker-compose-no-tls.yaml @@ -102,7 +102,7 @@ services: cli: container_name: cli - image: hyperledger/fabric-peer + image: hyperledger/fabric-testenv tty: true environment: - GOPATH=/opt/gopath diff --git a/examples/e2e_cli/docker-compose.yaml b/examples/e2e_cli/docker-compose.yaml index 678f895cdff..167cd5ecbde 100644 --- a/examples/e2e_cli/docker-compose.yaml +++ b/examples/e2e_cli/docker-compose.yaml @@ -181,10 +181,9 @@ services: cli: container_name: cli - image: hyperledger/fabric-peer + image: hyperledger/fabric-testenv tty: true environment: - - GOPATH=/opt/gopath - CORE_PEER_ADDRESSAUTODETECT=true - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - CORE_LOGGING_LEVEL=DEBUG diff --git a/examples/e2e_cli/end-to-end.rst b/examples/e2e_cli/end-to-end.rst index b3bb0c83654..4745b4d2d91 100644 --- a/examples/e2e_cli/end-to-end.rst +++ b/examples/e2e_cli/end-to-end.rst @@ -45,7 +45,7 @@ Prerequisites .. code:: bash # make sure you are in vagrant and in the /fabric directory - make peer-docker orderer-docker + make docker Execute a ``docker images`` command in your terminal. If the images compiled successfully, you should see an output similar to the