epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-25 19:15:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update docker images

Browse source
This commit is contained in:
Pietro Ghezzi 2022-02-27 16:41:08 +01:00
parent f50b52ad56
commit d115bdce20
20 changed files with 3843 additions and 6726 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2867
asset-transfer-basic/chaincode-typescript/npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

1
commercial-paper/organization/magnetocorp/configuration/cli/docker-compose.yml
View file

@ -12,6 +12,7 @@ networks:
services: services:
cliMagnetoCorp: cliMagnetoCorp:
platform: linux/amd64
container_name: cliMagnetoCorp container_name: cliMagnetoCorp
image: hyperledger/fabric-tools:2.0.0-beta image: hyperledger/fabric-tools:2.0.0-beta
tty: true tty: true

6
interest_rate_swaps/network/docker-compose.yaml
View file

@ -15,7 +15,7 @@ volumes:
services: services:
peer-base: peer-base:
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
environment: environment:
- CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
- FABRIC_LOGGING_SPEC=INFO - FABRIC_LOGGING_SPEC=INFO
@ -29,7 +29,7 @@ services:
orderer: orderer:
container_name: irs-orderer container_name: irs-orderer
image: hyperledger/fabric-orderer:latest image: hyperledger/fabric-orderer:2.4
environment: environment:
- FABRIC_LOGGING_SPEC=INFO - FABRIC_LOGGING_SPEC=INFO
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@ -132,7 +132,7 @@ services:
cli: cli:
container_name: cli container_name: cli
image: hyperledger/fabric-tools:latest image: hyperledger/fabric-tools:2.4
tty: true tty: true
stdin_open: true stdin_open: true
environment: environment:

4
interest_rate_swaps/network/network.sh
View file

@ -72,7 +72,7 @@ function checkPrereqs() {
# Note, we check configtxlator externally because it does not require a config file, and peer in the # 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 # docker image because of FAB-8551 that makes configtxlator return 'development version' in docker
LOCAL_VERSION=$(configtxgen -version | sed -ne 's/ Version: //p') 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 "LOCAL_VERSION=$LOCAL_VERSION"
echo "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION" echo "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"
@ -132,7 +132,7 @@ function networkDown() {
# Bring down the network, deleting the volumes # Bring down the network, deleting the volumes
#Delete any ledger backups #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 #Cleanup the chaincode containers
clearContainers clearContainers
#Cleanup images #Cleanup images

18
test-network-k8s/config/org1/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -78,7 +77,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -411,13 +409,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -469,7 +464,6 @@ peer:
# #
############################################################################### ###############################################################################
vm: vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
@ -519,7 +513,6 @@ vm:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -551,6 +544,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -563,7 +557,6 @@ chaincode:
propagateEnvironment: propagateEnvironment:
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
# The maximum duration to wait for the chaincode build and install process # The maximum duration to wait for the chaincode build and install process
# to complete. # to complete.
installTimeout: 300s installTimeout: 300s
@ -608,7 +601,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

17
test-network-k8s/config/org2/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -78,7 +77,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -411,13 +409,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -469,7 +464,6 @@ peer:
# #
############################################################################### ###############################################################################
vm: vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
@ -519,7 +513,6 @@ vm:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -551,6 +544,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -607,7 +601,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

3
test-network/addOrg3/compose/compose-ca-org3.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
networks: networks:
test: test:
@ -11,6 +11,7 @@ networks:
services: services:
ca_org3: ca_org3:
platform: linux/amd64
image: hyperledger/fabric-ca:latest image: hyperledger/fabric-ca:latest
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric

5
test-network/addOrg3/compose/compose-org3.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
volumes: volumes:
peer0.org3.example.com: peer0.org3.example.com:
@ -13,10 +13,9 @@ networks:
name: fabric_test name: fabric_test
services: services:
peer0.org3.example.com: peer0.org3.example.com:
container_name: peer0.org3.example.com container_name: peer0.org3.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:

2
test-network/addOrg3/compose/docker/docker-compose-org3.yaml
View file

@ -16,7 +16,7 @@ services:
peer0.org3.example.com: peer0.org3.example.com:
container_name: peer0.org3.example.com container_name: peer0.org3.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:

25
test-network/addOrg3/compose/docker/peercfg/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -57,7 +56,6 @@ peer:
# to other network nodes. # to other network nodes.
dialTimeout: 2m dialTimeout: 2m
# Keepalive settings for peer server and clients # Keepalive settings for peer server and clients
keepalive: keepalive:
# Interval is the duration after which if the server does not see # Interval is the duration after which if the server does not see
@ -90,7 +88,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -427,13 +424,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -492,14 +486,14 @@ peer:
# #
############################################################################### ###############################################################################
vm: vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
# https://localhost:2376 # https://localhost:2376
# If you utilize external chaincode builders and don't need the default Docker chaincode builder, # 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. # 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 # settings for docker vms
docker: docker:
@ -514,7 +508,8 @@ vm:
# Enables/disables the standard out/err from chaincode containers for # Enables/disables the standard out/err from chaincode containers for
# debugging purposes # debugging purposes
attachStdout: false attachStdout:
false
# Parameters on creating docker container. # Parameters on creating docker container.
# Container may be efficiently created using ipam & dns-server for cluster # Container may be efficiently created using ipam & dns-server for cluster
@ -544,7 +539,6 @@ vm:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -576,6 +570,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -590,7 +585,6 @@ chaincode:
propagateEnvironment: propagateEnvironment:
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
# The maximum duration to wait for the chaincode build and install process # The maximum duration to wait for the chaincode build and install process
# to complete. # to complete.
installTimeout: 300s installTimeout: 300s
@ -635,7 +629,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

98
test-network/addOrg3/compose/podman/peercfg/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -57,7 +56,6 @@ peer:
# to other network nodes. # to other network nodes.
dialTimeout: 2m dialTimeout: 2m
# Keepalive settings for peer server and clients # Keepalive settings for peer server and clients
keepalive: keepalive:
# Interval is the duration after which if the server does not see # Interval is the duration after which if the server does not see
@ -90,7 +88,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -427,13 +424,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -493,50 +487,50 @@ peer:
############################################################################### ###############################################################################
#vm: #vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
# https://localhost:2376 # https://localhost:2376
# If you utilize external chaincode builders and don't need the default Docker chaincode builder, # 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. # 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 # settings for docker vms
# docker: # docker:
# tls: # tls:
# enabled: false # enabled: false
# ca: # ca:
# file: docker/ca.crt # file: docker/ca.crt
# cert: # cert:
# file: docker/tls.crt # file: docker/tls.crt
# key: # key:
# file: docker/tls.key # file: docker/tls.key
# Enables/disables the standard out/err from chaincode containers for # Enables/disables the standard out/err from chaincode containers for
# debugging purposes # debugging purposes
# attachStdout: false # attachStdout: false
# Parameters on creating docker container. # Parameters on creating docker container.
# Container may be efficiently created using ipam & dns-server for cluster # Container may be efficiently created using ipam & dns-server for cluster
# NetworkMode - sets the networking mode for the container. Supported # NetworkMode - sets the networking mode for the container. Supported
# standard values are: `host`(default),`bridge`,`ipvlan`,`none`. # standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
# Dns - a list of DNS servers for the container to use. # Dns - a list of DNS servers for the container to use.
# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of # Note: `Privileged` `Binds` `Links` and `PortBindings` properties of
# Docker Host Config are not supported and will not be used if set. # Docker Host Config are not supported and will not be used if set.
# LogConfig - sets the logging driver (Type) and related options # LogConfig - sets the logging driver (Type) and related options
# (Config) for Docker. For more info, # (Config) for Docker. For more info,
# https://docs.docker.com/engine/admin/logging/overview/ # https://docs.docker.com/engine/admin/logging/overview/
# Note: Set LogConfig using Environment Variables is not supported. # Note: Set LogConfig using Environment Variables is not supported.
# hostConfig: # hostConfig:
# NetworkMode: host # NetworkMode: host
# Dns: # Dns:
# # - 192.168.0.1 # # - 192.168.0.1
# LogConfig: # LogConfig:
# Type: json-file # Type: json-file
# Config: # Config:
# max-size: "50m" # max-size: "50m"
# max-file: "5" # max-file: "5"
# Memory: 2147483648 # Memory: 2147483648
############################################################################### ###############################################################################
# #
@ -544,7 +538,6 @@ peer:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -576,6 +569,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -590,7 +584,6 @@ chaincode:
propagateEnvironment: propagateEnvironment:
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
# The maximum duration to wait for the chaincode build and install process # The maximum duration to wait for the chaincode build and install process
# to complete. # to complete.
installTimeout: 300s installTimeout: 300s
@ -635,7 +628,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

3
test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
networks: networks:
test: test:
@ -11,6 +11,7 @@ networks:
services: services:
ca_org3: ca_org3:
platform: linux/amd64
image: hyperledger/fabric-ca:latest image: hyperledger/fabric-ca:latest
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric

5
test-network/addOrg3/compose/podman/podman-compose-org3.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
volumes: volumes:
peer0.org3.example.com: peer0.org3.example.com:
@ -13,10 +13,9 @@ networks:
name: fabric_test name: fabric_test
services: services:
peer0.org3.example.com: peer0.org3.example.com:
container_name: peer0.org3.example.com container_name: peer0.org3.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:

6
test-network/compose/compose-ca.yaml
View file

@ -3,15 +3,15 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
networks: networks:
test: test:
name: fabric_test name: fabric_test
services: services:
ca_org1: ca_org1:
platform: linux/amd64
image: hyperledger/fabric-ca:latest image: hyperledger/fabric-ca:latest
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
@ -32,6 +32,7 @@ services:
- test - test
ca_org2: ca_org2:
platform: linux/amd64
image: hyperledger/fabric-ca:latest image: hyperledger/fabric-ca:latest
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
@ -52,6 +53,7 @@ services:
- test - test
ca_orderer: ca_orderer:
platform: linux/amd64
image: hyperledger/fabric-ca:latest image: hyperledger/fabric-ca:latest
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric

9
test-network/compose/compose-test-net.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
version: '3.7' version: "3.7"
volumes: volumes:
orderer.example.com: orderer.example.com:
@ -15,10 +15,9 @@ networks:
name: fabric_test name: fabric_test
services: services:
orderer.example.com: orderer.example.com:
container_name: orderer.example.com container_name: orderer.example.com
image: hyperledger/fabric-orderer:latest image: hyperledger/fabric-orderer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:
@ -60,7 +59,7 @@ services:
peer0.org1.example.com: peer0.org1.example.com:
container_name: peer0.org1.example.com container_name: peer0.org1.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:
@ -99,7 +98,7 @@ services:
peer0.org2.example.com: peer0.org2.example.com:
container_name: peer0.org2.example.com container_name: peer0.org2.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:

9
test-network/compose/docker/docker-compose-test-net.yaml
View file

@ -6,8 +6,9 @@
version: '3.7' version: '3.7'
services: services:
peer0.org1.example.com: peer0.org1.example.com:
platform: linux/amd64
container_name: peer0.org1.example.com container_name: peer0.org1.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:
@ -19,8 +20,9 @@ services:
- ${DOCKER_SOCK}:/host/var/run/docker.sock - ${DOCKER_SOCK}:/host/var/run/docker.sock
peer0.org2.example.com: peer0.org2.example.com:
platform: linux/amd64
container_name: peer0.org2.example.com container_name: peer0.org2.example.com
image: hyperledger/fabric-peer:latest image: hyperledger/fabric-peer:2.4
labels: labels:
service: hyperledger-fabric service: hyperledger-fabric
environment: environment:
@ -33,6 +35,7 @@ services:
cli: cli:
container_name: cli container_name: cli
image: hyperledger/fabric-tools:latest platform: linux/amd64
image: hyperledger/fabric-tools:2.4
volumes: volumes:
- ./docker/peercfg:/etc/hyperledger/peercfg - ./docker/peercfg:/etc/hyperledger/peercfg

25
test-network/compose/docker/peercfg/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -57,7 +56,6 @@ peer:
# to other network nodes. # to other network nodes.
dialTimeout: 2m dialTimeout: 2m
# Keepalive settings for peer server and clients # Keepalive settings for peer server and clients
keepalive: keepalive:
# Interval is the duration after which if the server does not see # Interval is the duration after which if the server does not see
@ -90,7 +88,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -427,13 +424,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -492,14 +486,14 @@ peer:
# #
############################################################################### ###############################################################################
vm: vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
# https://localhost:2376 # https://localhost:2376
# If you utilize external chaincode builders and don't need the default Docker chaincode builder, # 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. # 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 # settings for docker vms
docker: docker:
@ -514,7 +508,8 @@ vm:
# Enables/disables the standard out/err from chaincode containers for # Enables/disables the standard out/err from chaincode containers for
# debugging purposes # debugging purposes
attachStdout: false attachStdout:
false
# Parameters on creating docker container. # Parameters on creating docker container.
# Container may be efficiently created using ipam & dns-server for cluster # Container may be efficiently created using ipam & dns-server for cluster
@ -544,7 +539,6 @@ vm:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -576,6 +570,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -590,7 +585,6 @@ chaincode:
propagateEnvironment: propagateEnvironment:
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
# The maximum duration to wait for the chaincode build and install process # The maximum duration to wait for the chaincode build and install process
# to complete. # to complete.
installTimeout: 300s installTimeout: 300s
@ -635,7 +629,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

98
test-network/compose/podman/peercfg/core.yaml
View file

@ -9,7 +9,6 @@
# #
############################################################################### ###############################################################################
peer: peer:
# The peer id provides a name for this peer instance and is used when # The peer id provides a name for this peer instance and is used when
# naming docker resources. # naming docker resources.
id: jdoe id: jdoe
@ -57,7 +56,6 @@ peer:
# to other network nodes. # to other network nodes.
dialTimeout: 2m dialTimeout: 2m
# Keepalive settings for peer server and clients # Keepalive settings for peer server and clients
keepalive: keepalive:
# Interval is the duration after which if the server does not see # Interval is the duration after which if the server does not see
@ -90,7 +88,6 @@ peer:
# ordering nodes before closing the connection # ordering nodes before closing the connection
timeout: 20s timeout: 20s
# Gossip related configuration # Gossip related configuration
gossip: gossip:
# Bootstrap set to initialize gossip with. # Bootstrap set to initialize gossip with.
@ -427,13 +424,10 @@ peer:
# library: /etc/hyperledger/fabric/plugin/escc.so # library: /etc/hyperledger/fabric/plugin/escc.so
handlers: handlers:
authFilters: authFilters:
- - name: DefaultAuth
name: DefaultAuth - name: ExpirationCheck # This filter checks identity x509 certificate expiration
-
name: ExpirationCheck # This filter checks identity x509 certificate expiration
decorators: decorators:
- - name: DefaultDecorator
name: DefaultDecorator
endorsers: endorsers:
escc: escc:
name: DefaultEndorsement name: DefaultEndorsement
@ -493,50 +487,50 @@ peer:
############################################################################### ###############################################################################
#vm: #vm:
# Endpoint of the vm management system. For docker can be one of the following in general # Endpoint of the vm management system. For docker can be one of the following in general
# unix:///var/run/docker.sock # unix:///var/run/docker.sock
# http://localhost:2375 # http://localhost:2375
# https://localhost:2376 # https://localhost:2376
# If you utilize external chaincode builders and don't need the default Docker chaincode builder, # 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. # 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 # settings for docker vms
# docker: # docker:
# tls: # tls:
# enabled: false # enabled: false
# ca: # ca:
# file: docker/ca.crt # file: docker/ca.crt
# cert: # cert:
# file: docker/tls.crt # file: docker/tls.crt
# key: # key:
# file: docker/tls.key # file: docker/tls.key
# Enables/disables the standard out/err from chaincode containers for # Enables/disables the standard out/err from chaincode containers for
# debugging purposes # debugging purposes
# attachStdout: false # attachStdout: false
# Parameters on creating docker container. # Parameters on creating docker container.
# Container may be efficiently created using ipam & dns-server for cluster # Container may be efficiently created using ipam & dns-server for cluster
# NetworkMode - sets the networking mode for the container. Supported # NetworkMode - sets the networking mode for the container. Supported
# standard values are: `host`(default),`bridge`,`ipvlan`,`none`. # standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
# Dns - a list of DNS servers for the container to use. # Dns - a list of DNS servers for the container to use.
# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of # Note: `Privileged` `Binds` `Links` and `PortBindings` properties of
# Docker Host Config are not supported and will not be used if set. # Docker Host Config are not supported and will not be used if set.
# LogConfig - sets the logging driver (Type) and related options # LogConfig - sets the logging driver (Type) and related options
# (Config) for Docker. For more info, # (Config) for Docker. For more info,
# https://docs.docker.com/engine/admin/logging/overview/ # https://docs.docker.com/engine/admin/logging/overview/
# Note: Set LogConfig using Environment Variables is not supported. # Note: Set LogConfig using Environment Variables is not supported.
# hostConfig: # hostConfig:
# NetworkMode: host # NetworkMode: host
# Dns: # Dns:
# # - 192.168.0.1 # # - 192.168.0.1
# LogConfig: # LogConfig:
# Type: json-file # Type: json-file
# Config: # Config:
# max-size: "50m" # max-size: "50m"
# max-file: "5" # max-file: "5"
# Memory: 2147483648 # Memory: 2147483648
############################################################################### ###############################################################################
# #
@ -544,7 +538,6 @@ peer:
# #
############################################################################### ###############################################################################
chaincode: chaincode:
# The id is used by the Chaincode stub to register the executing 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 # ID with the Peer and is generally supplied through ENV variables
# the `path` form of ID is provided when installing the chaincode. # the `path` form of ID is provided when installing the chaincode.
@ -576,6 +569,7 @@ chaincode:
runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION)
node: node:
platform: linux/amd64
# This is an image based on node:$(NODE_VER)-alpine # This is an image based on node:$(NODE_VER)-alpine
runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION)
@ -590,7 +584,6 @@ chaincode:
propagateEnvironment: propagateEnvironment:
- CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
# The maximum duration to wait for the chaincode build and install process # The maximum duration to wait for the chaincode build and install process
# to complete. # to complete.
installTimeout: 300s installTimeout: 300s
@ -635,7 +628,7 @@ chaincode:
# Override default level for the 'shim' logger # Override default level for the 'shim' logger
shim: warning shim: warning
# Format for the chaincode container logs # 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: ledger:
blockchain: blockchain:
state: state:

2
test-network/network.sh
View file

@ -68,7 +68,7 @@ function checkPrereqs() {
# use the fabric tools container to see if the samples and binaries match your # use the fabric tools container to see if the samples and binaries match your
# docker images # docker images
LOCAL_VERSION=$(peer version | sed -ne 's/^ Version: //p') 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 "LOCAL_VERSION=$LOCAL_VERSION"
infoln "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION" infoln "DOCKER_IMAGE_VERSION=$DOCKER_IMAGE_VERSION"