[ gh-30 ] token sample .

Signed-off-by: ZHANG, HENGMING <22887031+ghpZ54K8ZRwU62zGVSePPs97yAv9swuAY0mVDR4@users.noreply.github.com>

Author: ghpZ54K8ZRwU62zGVSePPs97yAv9swuAY0mVDR4

samples/tokens/Makefile

@@ -54,4 +54,4 @@ help:
 				help_msg = ""; \
 			} \
 		} \
-	' $(MAKEFILE_LIST)
+	' $(MAKEFILE_LIST)

samples/tokens/README.md

@@ -104,7 +104,6 @@ To run on Fabric v3, we use Fabric samples test network (`$(FABRIC_SAMPLES)/test
 Ensure Fabric binaries are in your `PATH` and Docker images are available. If not, install them as follows. 
 
 ```shell
-curl -sSLO https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh && chmod +x install-fabric.sh
 ./install-fabric.sh --fabric-version 3.1.1
 export PATH=$(pwd)/fabric-samples/bin:$PATH
 ```

samples/tokens/app.mk

@@ -8,6 +8,7 @@ export PLATFORM
 ifneq ($(PLATFORM),fabricx)
 	COMPOSE_ARGS := -f compose.yml -f compose-endorser2.yml
 endif
+CONTAINER_CLI ?= docker
 
 # Setup application
 .PHONY: setup-app
@@ -17,28 +18,28 @@ setup-app: build-app
 # Setup application
 .PHONY: build-app
 build-app:
-	docker-compose $(COMPOSE_ARGS) build
+	$(CONTAINER_CLI)-compose $(COMPOSE_ARGS) build
 
 # Start application
 .PHONY: start-app
 start-app:
-	docker-compose $(COMPOSE_ARGS) up -d
+	$(CONTAINER_CLI)-compose $(COMPOSE_ARGS) up -d
 
 # Restart application
 .PHONY: restart-app
 restart-app:
-	docker-compose $(COMPOSE_ARGS) down
-	docker-compose $(COMPOSE_ARGS) up -d
+	$(CONTAINER_CLI)-compose $(COMPOSE_ARGS) down
+	$(CONTAINER_CLI)-compose $(COMPOSE_ARGS) up -d
 
 # Stop application
 .PHONY: stop-app
 stop-app:
-	PLATFORM=$(PLATFORM) docker-compose $(COMPOSE_ARGS) stop
+	PLATFORM=$(PLATFORM) $(CONTAINER_CLI)-compose $(COMPOSE_ARGS) stop
 
 # Teardown application
 .PHONY: teardown-app
 teardown-app:
-	docker-compose $(COMPOSE_ARGS) down
+	$(CONTAINER_CLI)-compose $(COMPOSE_ARGS) down
 	rm -rf "$(CONF_ROOT)"/*/data
 
 # Clean just the databases.

samples/tokens/compose-endorser2.yml

@@ -22,7 +22,8 @@ services:
     volumes:
       - ./${CONF_ROOT:-conf}/endorser2:/conf
     expose:
-      - 9401:9001
+      - 9401
+      - 9001
     ports:
       - 9400:9000/tcp
 

samples/tokens/compose.yml

@@ -24,7 +24,8 @@ services:
     volumes:
       - ./${CONF_ROOT:-conf}/issuer:/conf
     expose:
-      - 9101:9001
+      - 9001
+      - 9101
     ports:
       - 9100:9000/tcp
 
@@ -41,7 +42,8 @@ services:
       - ./${CONF_ROOT:-conf}/endorser1:/conf
       - ./${CONF_ROOT:-conf}/namespace/zkatdlognoghv1_pp.json:/namespace/zkatdlognoghv1_pp.json
     expose:
-      - 9301:9001
+      - 9001
+      - 9301
     ports:
       - 9300:9000/tcp
 
@@ -57,7 +59,8 @@ services:
     volumes:
       - ./${CONF_ROOT:-conf}/owner1:/conf
     expose:
-      - 9501:9001
+      - 9001
+      - 9501
     ports:
       - 9500:9000/tcp
 
@@ -73,7 +76,8 @@ services:
     volumes:
       - ./${CONF_ROOT:-conf}/owner2:/conf
     expose:
-      - 9601:9001
+      - 9001
+      - 9601
     ports:
       - 9600:9000/tcp
 

samples/tokens/fabric3.mk

@@ -14,6 +14,7 @@ export CONF_ROOT
 # Makefile vars
 PLAYBOOK_PATH := $(CURDIR)/ansible/playbooks
 TARGET_HOSTS ?= all
+CONTAINER_CLI ?= docker
 
 # Install the utilities needed to run the components on the targeted remote hosts (e.g. make install-prerequisites).
 .PHONY: install-prerequisites-fabric
@@ -55,11 +56,11 @@ stop-fabric:
 .PHONY: teardown-fabric
 teardown-fabric:
 	@"$(FABRIC_SAMPLES)/test-network/network.sh" down
-	@docker rm -f peer0org1_token_namespace_ccaas peer0org2_token_namespace_ccaas
+	@$(CONTAINER_CLI) rm -f peer0org1_token_namespace_ccaas peer0org2_token_namespace_ccaas
 	@for d in "$(CONF_ROOT)"/*/ ; do \
 		rm -rf "$$d/keys/fabric" "$$d/data"; \
 	done
-	@docker network inspect fabric_test >/dev/null 2>&1 && docker network rm fabric_test || true
+	@$(CONTAINER_CLI) network inspect fabric_test >/dev/null 2>&1 && $(CONTAINER_CLI) network rm fabric_test || true
 
 # Restart the targeted hosts (e.g. make fabric-x restart).
 .PHONY: restart-fabric

samples/tokens/fabricx.mk

@@ -16,6 +16,7 @@ export CONF_ROOT
 # Makefile vars
 PLAYBOOK_PATH := $(CURDIR)/ansible/playbooks
 TARGET_HOSTS ?= all
+CONTAINER_CLI ?= docker
 
 # Install the utilities needed to run the components on the targeted remote hosts (e.g. make install-prerequisites).
 .PHONY: install-prerequisites-fabric
@@ -39,7 +40,7 @@ clean-fabric:
 # Start fabric-x on the targeted hosts.
 .PHONY: start-fabric
 start-fabric:
-	@docker network inspect fabric_test >/dev/null 2>&1 || docker network create fabric_test
+	@$(CONTAINER_CLI) network inspect fabric_test >/dev/null 2>&1 || $(CONTAINER_CLI) network create fabric_test
 	ansible-playbook "$(PLAYBOOK_PATH)/60-start.yaml"
 
 # Create a namespace in fabric-x for the tokens.
@@ -62,7 +63,7 @@ stop-fabric:
 .PHONY: teardown-fabric
 teardown-fabric:
 	ansible-playbook "$(PLAYBOOK_PATH)/80-teardown.yaml"
-	@docker network inspect fabric_test >/dev/null 2>&1 && docker network rm fabric_test || true
+	@$(CONTAINER_CLI) network inspect fabric_test >/dev/null 2>&1 && $(CONTAINER_CLI) network rm fabric_test || true
 
 # Restart the targeted hosts (e.g. make fabric-x restart).
 .PHONY: restart-fabric

samples/tokens/install-fabric.sh

@@ -21,7 +21,7 @@ _arg_comp=('' )
 
 # if version not passed in, default to latest released version
 # if ca version not passed in, default to latest released version
-_arg_fabric_version="2.5.12"
+_arg_fabric_version="2.5.14"
 _arg_ca_version="1.5.15"
 
 OS=$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')
@@ -56,7 +56,7 @@ print_help()
 {
 	printf 'Usage: %s [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...\n' "$0"
 	printf '\t%s\n' "<comp> Component to install, one or more of  docker | binary | samples | podman  First letter of component also accepted; If none specified docker | binary | samples is assumed"
-	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.12')"
+	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.14')"
 	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.15')"
 }
 
@@ -252,7 +252,7 @@ download() {
        DEST_DIR="fabric-samples"
     fi
     echo "===> Will unpack to: ${DEST_DIR}"
-    curl -L --retry 5 --retry-delay 3 "${URL}" | tar xz -C ${DEST_DIR}|| rc=$?
+    curl -L --retry 5 --retry-delay 3 "${URL}" | tar xz -C "${DEST_DIR}"|| rc=$?
     if [ -n "$rc" ]; then
         echo "==> There was an error downloading the binary file."
         return 22