mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-26 03:25:09 +00:00
update docker images
This commit is contained in:
Pietro Ghezzi
parent
f50b52ad56
commit
d115bdce20
20 changed files with 3843 additions and 6726 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -12,6 +12,7 @@ networks:
|
|||
|
||||
services:
|
||||
cliMagnetoCorp:
|
||||
platform: linux/amd64
|
||||
container_name: cliMagnetoCorp
|
||||
image: hyperledger/fabric-tools:2.0.0-beta
|
||||
tty: true
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ volumes:
|
|||
|
||||
services:
|
||||
peer-base:
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
environment:
|
||||
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
|
||||
- FABRIC_LOGGING_SPEC=INFO
|
||||
|
|
@ -29,7 +29,7 @@ services:
|
|||
|
||||
orderer:
|
||||
container_name: irs-orderer
|
||||
image: hyperledger/fabric-orderer:latest
|
||||
image: hyperledger/fabric-orderer:2.4
|
||||
environment:
|
||||
- FABRIC_LOGGING_SPEC=INFO
|
||||
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
|
||||
|
|
@ -132,7 +132,7 @@ services:
|
|||
|
||||
cli:
|
||||
container_name: cli
|
||||
image: hyperledger/fabric-tools:latest
|
||||
image: hyperledger/fabric-tools:2.4
|
||||
tty: true
|
||||
stdin_open: true
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ function checkPrereqs() {
|
|||
# Note, we check configtxlator externally because it does not require a config file, and peer in the
|
||||
# docker image because of FAB-8551 that makes configtxlator return 'development version' in docker
|
||||
LOCAL_VERSION=$(configtxgen -version | sed -ne 's/ Version: //p')
|
||||
DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:latest peer version | sed -ne 's/ Version: //p' | head -1)
|
||||
DOCKER_IMAGE_VERSION=$(docker run --rm hyperledger/fabric-tools:2.4 peer version | sed -ne 's/ Version: //p' | head -1)
|
||||
|
||||
echo "LOCAL_VERSION=$LOCAL_VERSION"
|
||||
echo "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"
|
||||
|
|
@ -132,7 +132,7 @@ function networkDown() {
|
|||
|
||||
# Bring down the network, deleting the volumes
|
||||
#Delete any ledger backups
|
||||
docker run -v "$PWD:/tmp/first-network" --rm hyperledger/fabric-tools:latest rm -Rf /tmp/first-network/ledgers-backup
|
||||
docker run -v "$PWD:/tmp/first-network" --rm hyperledger/fabric-tools:2.4 rm -Rf /tmp/first-network/ledgers-backup
|
||||
#Cleanup the chaincode containers
|
||||
clearContainers
|
||||
#Cleanup images
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -78,7 +77,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -411,13 +409,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -469,7 +464,6 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
vm:
|
||||
|
||||
# Endpoint of the vm management system. For docker can be one of the following in general
|
||||
# unix:///var/run/docker.sock
|
||||
# http://localhost:2375
|
||||
|
|
@ -519,7 +513,6 @@ vm:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -551,6 +544,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -563,7 +557,6 @@ chaincode:
|
|||
propagateEnvironment:
|
||||
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
|
||||
|
||||
|
||||
# The maximum duration to wait for the chaincode build and install process
|
||||
# to complete.
|
||||
installTimeout: 300s
|
||||
|
|
@ -608,7 +601,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -617,7 +610,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -78,7 +77,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -411,13 +409,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -469,7 +464,6 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
vm:
|
||||
|
||||
# Endpoint of the vm management system. For docker can be one of the following in general
|
||||
# unix:///var/run/docker.sock
|
||||
# http://localhost:2375
|
||||
|
|
@ -519,7 +513,6 @@ vm:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -551,6 +544,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -607,7 +601,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -616,7 +610,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
networks:
|
||||
test:
|
||||
|
|
@ -11,6 +11,7 @@ networks:
|
|||
|
||||
services:
|
||||
ca_org3:
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-ca:latest
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
volumes:
|
||||
peer0.org3.example.com:
|
||||
|
|
@ -13,10 +13,9 @@ networks:
|
|||
name: fabric_test
|
||||
|
||||
services:
|
||||
|
||||
peer0.org3.example.com:
|
||||
container_name: peer0.org3.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ services:
|
|||
|
||||
peer0.org3.example.com:
|
||||
container_name: peer0.org3.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -57,7 +56,6 @@ peer:
|
|||
# to other network nodes.
|
||||
dialTimeout: 2m
|
||||
|
||||
|
||||
# Keepalive settings for peer server and clients
|
||||
keepalive:
|
||||
# Interval is the duration after which if the server does not see
|
||||
|
|
@ -90,7 +88,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -427,13 +424,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -492,14 +486,14 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
vm:
|
||||
|
||||
# Endpoint of the vm management system. For docker can be one of the following in general
|
||||
# unix:///var/run/docker.sock
|
||||
# http://localhost:2375
|
||||
# https://localhost:2376
|
||||
# If you utilize external chaincode builders and don't need the default Docker chaincode builder,
|
||||
# the endpoint should be unconfigured so that the peer's Docker health checker doesn't get registered.
|
||||
endpoint: unix:///var/run/docker.sock
|
||||
endpoint:
|
||||
unix:///var/run/docker.sock
|
||||
|
||||
# settings for docker vms
|
||||
docker:
|
||||
|
|
@ -514,7 +508,8 @@ vm:
|
|||
|
||||
# Enables/disables the standard out/err from chaincode containers for
|
||||
# debugging purposes
|
||||
attachStdout: false
|
||||
attachStdout:
|
||||
false
|
||||
|
||||
# Parameters on creating docker container.
|
||||
# Container may be efficiently created using ipam & dns-server for cluster
|
||||
|
|
@ -544,7 +539,6 @@ vm:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -576,6 +570,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -590,7 +585,6 @@ chaincode:
|
|||
propagateEnvironment:
|
||||
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
|
||||
|
||||
|
||||
# The maximum duration to wait for the chaincode build and install process
|
||||
# to complete.
|
||||
installTimeout: 300s
|
||||
|
|
@ -635,7 +629,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -644,7 +638,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -57,7 +56,6 @@ peer:
|
|||
# to other network nodes.
|
||||
dialTimeout: 2m
|
||||
|
||||
|
||||
# Keepalive settings for peer server and clients
|
||||
keepalive:
|
||||
# Interval is the duration after which if the server does not see
|
||||
|
|
@ -90,7 +88,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -427,13 +424,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -544,7 +538,6 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -576,6 +569,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -590,7 +584,6 @@ chaincode:
|
|||
propagateEnvironment:
|
||||
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
|
||||
|
||||
|
||||
# The maximum duration to wait for the chaincode build and install process
|
||||
# to complete.
|
||||
installTimeout: 300s
|
||||
|
|
@ -635,7 +628,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -644,7 +637,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
networks:
|
||||
test:
|
||||
|
|
@ -11,6 +11,7 @@ networks:
|
|||
|
||||
services:
|
||||
ca_org3:
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-ca:latest
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
volumes:
|
||||
peer0.org3.example.com:
|
||||
|
|
@ -13,10 +13,9 @@ networks:
|
|||
name: fabric_test
|
||||
|
||||
services:
|
||||
|
||||
peer0.org3.example.com:
|
||||
container_name: peer0.org3.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
networks:
|
||||
test:
|
||||
name: fabric_test
|
||||
|
||||
services:
|
||||
|
||||
ca_org1:
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-ca:latest
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
|
|
@ -32,6 +32,7 @@ services:
|
|||
- test
|
||||
|
||||
ca_org2:
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-ca:latest
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
|
|
@ -52,6 +53,7 @@ services:
|
|||
- test
|
||||
|
||||
ca_orderer:
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-ca:latest
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
version: '3.7'
|
||||
version: "3.7"
|
||||
|
||||
volumes:
|
||||
orderer.example.com:
|
||||
|
|
@ -15,10 +15,9 @@ networks:
|
|||
name: fabric_test
|
||||
|
||||
services:
|
||||
|
||||
orderer.example.com:
|
||||
container_name: orderer.example.com
|
||||
image: hyperledger/fabric-orderer:latest
|
||||
image: hyperledger/fabric-orderer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
@ -60,7 +59,7 @@ services:
|
|||
|
||||
peer0.org1.example.com:
|
||||
container_name: peer0.org1.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
@ -99,7 +98,7 @@ services:
|
|||
|
||||
peer0.org2.example.com:
|
||||
container_name: peer0.org2.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
version: '3.7'
|
||||
services:
|
||||
peer0.org1.example.com:
|
||||
platform: linux/amd64
|
||||
container_name: peer0.org1.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
@ -19,8 +20,9 @@ services:
|
|||
- ${DOCKER_SOCK}:/host/var/run/docker.sock
|
||||
|
||||
peer0.org2.example.com:
|
||||
platform: linux/amd64
|
||||
container_name: peer0.org2.example.com
|
||||
image: hyperledger/fabric-peer:latest
|
||||
image: hyperledger/fabric-peer:2.4
|
||||
labels:
|
||||
service: hyperledger-fabric
|
||||
environment:
|
||||
|
|
@ -33,6 +35,7 @@ services:
|
|||
|
||||
cli:
|
||||
container_name: cli
|
||||
image: hyperledger/fabric-tools:latest
|
||||
platform: linux/amd64
|
||||
image: hyperledger/fabric-tools:2.4
|
||||
volumes:
|
||||
- ./docker/peercfg:/etc/hyperledger/peercfg
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -57,7 +56,6 @@ peer:
|
|||
# to other network nodes.
|
||||
dialTimeout: 2m
|
||||
|
||||
|
||||
# Keepalive settings for peer server and clients
|
||||
keepalive:
|
||||
# Interval is the duration after which if the server does not see
|
||||
|
|
@ -90,7 +88,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -427,13 +424,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -492,14 +486,14 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
vm:
|
||||
|
||||
# Endpoint of the vm management system. For docker can be one of the following in general
|
||||
# unix:///var/run/docker.sock
|
||||
# http://localhost:2375
|
||||
# https://localhost:2376
|
||||
# If you utilize external chaincode builders and don't need the default Docker chaincode builder,
|
||||
# the endpoint should be unconfigured so that the peer's Docker health checker doesn't get registered.
|
||||
endpoint: unix:///var/run/docker.sock
|
||||
endpoint:
|
||||
unix:///var/run/docker.sock
|
||||
|
||||
# settings for docker vms
|
||||
docker:
|
||||
|
|
@ -514,7 +508,8 @@ vm:
|
|||
|
||||
# Enables/disables the standard out/err from chaincode containers for
|
||||
# debugging purposes
|
||||
attachStdout: false
|
||||
attachStdout:
|
||||
false
|
||||
|
||||
# Parameters on creating docker container.
|
||||
# Container may be efficiently created using ipam & dns-server for cluster
|
||||
|
|
@ -544,7 +539,6 @@ vm:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -576,6 +570,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -590,7 +585,6 @@ chaincode:
|
|||
propagateEnvironment:
|
||||
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
|
||||
|
||||
|
||||
# The maximum duration to wait for the chaincode build and install process
|
||||
# to complete.
|
||||
installTimeout: 300s
|
||||
|
|
@ -635,7 +629,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -644,7 +638,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
#
|
||||
###############################################################################
|
||||
peer:
|
||||
|
||||
# The peer id provides a name for this peer instance and is used when
|
||||
# naming docker resources.
|
||||
id: jdoe
|
||||
|
|
@ -57,7 +56,6 @@ peer:
|
|||
# to other network nodes.
|
||||
dialTimeout: 2m
|
||||
|
||||
|
||||
# Keepalive settings for peer server and clients
|
||||
keepalive:
|
||||
# Interval is the duration after which if the server does not see
|
||||
|
|
@ -90,7 +88,6 @@ peer:
|
|||
# ordering nodes before closing the connection
|
||||
timeout: 20s
|
||||
|
||||
|
||||
# Gossip related configuration
|
||||
gossip:
|
||||
# Bootstrap set to initialize gossip with.
|
||||
|
|
@ -427,13 +424,10 @@ peer:
|
|||
# library: /etc/hyperledger/fabric/plugin/escc.so
|
||||
handlers:
|
||||
authFilters:
|
||||
-
|
||||
name: DefaultAuth
|
||||
-
|
||||
name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
- name: DefaultAuth
|
||||
- name: ExpirationCheck # This filter checks identity x509 certificate expiration
|
||||
decorators:
|
||||
-
|
||||
name: DefaultDecorator
|
||||
- name: DefaultDecorator
|
||||
endorsers:
|
||||
escc:
|
||||
name: DefaultEndorsement
|
||||
|
|
@ -544,7 +538,6 @@ peer:
|
|||
#
|
||||
###############################################################################
|
||||
chaincode:
|
||||
|
||||
# The id is used by the Chaincode stub to register the executing Chaincode
|
||||
# ID with the Peer and is generally supplied through ENV variables
|
||||
# the `path` form of ID is provided when installing the chaincode.
|
||||
|
|
@ -576,6 +569,7 @@ chaincode:
|
|||
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
node:
|
||||
platform: linux/amd64
|
||||
# This is an image based on node:$(NODE_VER)-alpine
|
||||
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
|
||||
|
||||
|
|
@ -590,7 +584,6 @@ chaincode:
|
|||
propagateEnvironment:
|
||||
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
|
||||
|
||||
|
||||
# The maximum duration to wait for the chaincode build and install process
|
||||
# to complete.
|
||||
installTimeout: 300s
|
||||
|
|
@ -635,7 +628,7 @@ chaincode:
|
|||
# Override default level for the 'shim' logger
|
||||
shim: warning
|
||||
# Format for the chaincode container logs
|
||||
format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}'
|
||||
format: "%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}"
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
|
@ -644,7 +637,6 @@ chaincode:
|
|||
#
|
||||
###############################################################################
|
||||
ledger:
|
||||
|
||||
blockchain:
|
||||
|
||||
state:
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ function checkPrereqs() {
|
|||
# use the fabric tools container to see if the samples and binaries match your
|
||||
# docker images
|
||||
LOCAL_VERSION=$(peer version | sed -ne 's/^ Version: //p')
|
||||
DOCKER_IMAGE_VERSION=$(${CONTAINER_CLI} run --rm hyperledger/fabric-tools:latest peer version | sed -ne 's/^ Version: //p')
|
||||
DOCKER_IMAGE_VERSION=$(${CONTAINER_CLI} run --rm hyperledger/fabric-tools:2.4 peer version | sed -ne 's/^ Version: //p')
|
||||
|
||||
infoln "LOCAL_VERSION=$LOCAL_VERSION"
|
||||
infoln "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"
|
||||
|
|
|
|||
Loading…
Reference in a new issue