update20210206

MAINTAINERS.md

@@ -5,6 +5,12 @@
 | Baohua Yang | yeasy | baohua | yangbaohua@gmail.com |
 | Haitao Yue | hightall | hightall | hightallyht@gmail.com |
 | Tong Li | tongli | tongli | litong01@us.ibm.com |
+| Qiang Xu | XuHugo | XuHugo | xq-310@163.com |
+
+## Retired Maintainers
+
+| Name | GitHub | RocketChat | Email |
+|---|---|---|---|
 | Luke Chen | LordGoodman | luke_chen | jiahaochen1993@gmail.com |
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

build_image/docker/cello-hlf/Dockerfile

@@ -36,7 +36,7 @@ ENV BASE_VERSION=2.2.0
 ENV PROJECT_VERSION=2.2.0
 ENV HLF_CA_VERSION=1.4.8
 
-# generic environment (core.yaml) for builder and runtime: builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION)
+# generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node
 ENV DOCKER_NS=hyperledger
 ENV TWO_DIGIT_VERSION=2.2
 
@@ -80,12 +80,12 @@ RUN mkdir -p /var/hyperledger/production \
 
 # Install development dependencies
 RUN apt-get update \
-        && apt-get install -y apt-utils python-dev \
+        && apt-get install -y apt-utils python3-dev \
         && apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev libyaml-dev libltdl-dev libtool \
-        && apt-get install -y python-pip \
+        && apt-get install -y python3-pip \
         && apt-get install -y vim tree jq unzip \
-        && pip install behave nose docker-compose \
-        && pip install pyinotify \
+        && pip3 install behave nose docker-compose \
+        && pip3 install pyinotify \
         && rm -rf /var/cache/apt
 
 # Install yq to update config for fabric-ca
@@ -99,9 +99,8 @@ RUN go get github.com/golang/protobuf/protoc-gen-go \
         && go get github.com/AlekSi/gocov-xml \
         && go get golang.org/x/tools/cmd/goimports \
         && go get golang.org/x/lint/golint \
-        && go get github.com/estesp/manifest-tool \
+        && go get github.com/estesp/manifest-tool/... \
         && go get github.com/client9/misspell/cmd/misspell \
-        && go get github.com/estesp/manifest-tool \
         && go get github.com/onsi/ginkgo/ginkgo
 
 # Clone the Hyperledger Fabric code and cp sample config files

build_image/docker/cello-hlf/scripts/init.sh

@@ -36,6 +36,14 @@ cmd=$1
 # The path to store the files
 cfg_path=${FABRIC_CFG_PATH:-/etc/hyperledger/fabric}
 
+# Clean the potential existing msp and tls paths first
+if [ ! -z "${HLF_NODE_MSP}" ] && [ -d ${cfg_path}/msp ]; then
+    mv ${cfg_path}/msp ${cfg_path}/msp.bak
+fi
+if [ ! -z "${HLF_NODE_TLS}" ] && [ -d ${cfg_path}/tls ]; then
+    mv ${cfg_path}/tls ${cfg_path}/tls.bak
+fi
+
 # Read each file from env and store under the ${cfg_path}
 for name in HLF_NODE_MSP \
 	HLF_NODE_TLS \

src/api-engine/api/config.py

@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+CELLO_HOME = "/opt/cello"
+FABRIC_TOOL = "/opt/bin"
+
+FABRIC_PEER_CFG = "/opt/node/peer.yaml.bak"
+FABRIC_ORDERER_CFG = "/opt/node/orderer.yaml.bak"
+FABRIC_CA_CFG = "/opt/node/ca.yaml.bak"