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

Merge branch 'main' into vlaca

Browse source
This commit is contained in:
Matthew B White 2021-09-03 08:14:42 +01:00 committed by GitHub
commit a8ac2b890e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ci/azure-pipelines.yml
View file

@ -17,7 +17,7 @@ jobs:
- job: CommercialPaper_Go
displayName: Commercial Paper (Go)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/commercial-paper/azure-pipelines-go.yml
@ -25,7 +25,7 @@ jobs:
- job: CommercialPaper_Java
displayName: Commercial Paper (Java)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/commercial-paper/azure-pipelines-java.yml
@ -33,7 +33,7 @@ jobs:
- job: CommercialPaper_JavaScript
displayName: Commercial Paper (JavaScript)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/commercial-paper/azure-pipelines-javascript.yml
@ -41,7 +41,7 @@ jobs:
- job: FabCar_Go
displayName: FabCar (Go)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/fabcar/azure-pipelines-go.yml
@ -49,7 +49,7 @@ jobs:
- job: FabCar_Java
displayName: FabCar (Java)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/fabcar/azure-pipelines-java.yml
@ -57,7 +57,7 @@ jobs:
- job: FabCar_JavaScript
displayName: FabCar (JavaScript)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/fabcar/azure-pipelines-javascript.yml
@ -65,7 +65,7 @@ jobs:
- job: Fabcar_TypeScript
displayName: FabCar (TypeScript)
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- template: templates/install-deps.yml
- template: templates/fabcar/azure-pipelines-typescript.yml
@ -73,7 +73,7 @@ jobs:
- job: Lint
displayName: Lint
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
steps:
- task: GoTool@0
inputs:
@ -92,7 +92,7 @@ jobs:
- job: TestNetworkBasic
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
Basic-Go:
@ -118,7 +118,7 @@ jobs:
- job: TestNetworkLedger
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
Ledger-Go:
@ -136,7 +136,7 @@ jobs:
- job: TestNetworkPrivate
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
Private-Go:
@ -151,7 +151,7 @@ jobs:
- job: TestNetworkSBE
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
SBE-Typescript:
@ -169,7 +169,7 @@ jobs:
- job: TestNetworkSecured
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
Secured-Go:
@ -184,7 +184,7 @@ jobs:
- job: TestNetworkEvents
displayName: Test Network
pool:
vmImage: ubuntu-18.04
vmImage: ubuntu-20.04
strategy:
matrix:
Events-Javascript:

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

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
networks:
test:

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

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
networks:
test:

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

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
volumes:
peer0.org3.example.com:

2
test-network/docker/docker-compose-ca.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
networks:
test:

2
test-network/docker/docker-compose-couch.yaml
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
networks:
test:

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

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
version: '2.4'
version: '3.7'
volumes:
orderer.example.com:
@ -32,8 +32,6 @@ services:
- ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key
- ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
- ORDERER_KAFKA_TOPIC_REPLICATIONFACTOR=1
- ORDERER_KAFKA_VERBOSE=true
- ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt
- ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key
- ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]