From 9beb0431315740854bb2e1e1dedc7bd78bea5e5b Mon Sep 17 00:00:00 2001
From: YeonhoPark <nicezic@naver.com>
Date: Mon, 19 Nov 2018 10:48:22 +0900
Subject: [PATCH] [FAB-12873] fix samples version, instead of latest.

to prevent docker for using the latest version.

Change-Id: Icd2e714089a3f9a5c3494266c10b9e503d29de0a
Signed-off-by: YeonhoPark <nicezic@naver.com>
---
 basic-network/.env               |  4 ++++
 basic-network/docker-compose.yml | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/basic-network/.env b/basic-network/.env
index 4fd2ee0d..c226807b 100644
--- a/basic-network/.env
+++ b/basic-network/.env
@@ -1 +1,5 @@
 COMPOSE_PROJECT_NAME=net
+VERSION=1.2.1
+CA_VERSION=1.2.1
+THIRDPARTY_IMAGE_VERSION=0.4.10
+
diff --git a/basic-network/docker-compose.yml b/basic-network/docker-compose.yml
index 2ebe3a43..d5dea9ac 100644
--- a/basic-network/docker-compose.yml
+++ b/basic-network/docker-compose.yml
@@ -10,7 +10,7 @@ networks:
 
 services:
   ca.example.com:
-    image: hyperledger/fabric-ca
+    image: hyperledger/fabric-ca:${VERSION}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca.example.com
@@ -27,7 +27,7 @@ services:
 
   orderer.example.com:
     container_name: orderer.example.com
-    image: hyperledger/fabric-orderer
+    image: hyperledger/fabric-orderer:${VERSION}
     environment:
       - ORDERER_GENERAL_LOGLEVEL=info
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -48,7 +48,7 @@ services:
 
   peer0.org1.example.com:
     container_name: peer0.org1.example.com
-    image: hyperledger/fabric-peer
+    image: hyperledger/fabric-peer:${VERSION}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org1.example.com
@@ -87,7 +87,7 @@ services:
 
   couchdb:
     container_name: couchdb
-    image: hyperledger/fabric-couchdb
+    image: hyperledger/fabric-couchdb:${THIRDPARTY_IMAGE_VERSION}
     # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
     # for CouchDB.  This will prevent CouchDB from operating in an "Admin Party" mode.
     environment:
@@ -100,7 +100,7 @@ services:
 
   cli:
     container_name: cli
-    image: hyperledger/fabric-tools
+    image: hyperledger/fabric-tools:${VERSION}
     tty: true
     environment:
       - GOPATH=/opt/gopath