update docker images

2026-06-23 01:55:10 +00:00 · 2022-02-27 16:41:08 +01:00 · 2022-02-27 16:41:08 +01:00 · d115bdce20
commit d115bdce20
parent f50b52ad56
20 changed files with 3843 additions and 6726 deletions
--- a/asset-transfer-basic/chaincode-typescript/npm-shrinkwrap.json
+++ b/asset-transfer-basic/chaincode-typescript/npm-shrinkwrap.json
--- a/commercial-paper/organization/magnetocorp/application/cpListener.js
+++ b/commercial-paper/organization/magnetocorp/application/cpListener.js
@ -15,7 +15,7 @@ let finished;
 async function main() {
    try {
        // Set up the wallet - just use Org2's wallet (isabella)
-	const wallet = await Wallets.newFileSystemWallet('../identity/user/isabella/wallet');
+	    const wallet = await Wallets.newFileSystemWallet('../identity/user/isabella/wallet');

        // Create a new gateway for connecting to our peer node.
        const gateway = new Gateway();
--- a/commercial-paper/organization/magnetocorp/configuration/cli/docker-compose.yml
+++ b/commercial-paper/organization/magnetocorp/configuration/cli/docker-compose.yml
@ -12,6 +12,7 @@ networks:

 services:
  cliMagnetoCorp:
+    platform: linux/amd64
    container_name: cliMagnetoCorp
    image: hyperledger/fabric-tools:2.0.0-beta
    tty: true
--- a/interest_rate_swaps/network/docker-compose.yaml
+++ b/interest_rate_swaps/network/docker-compose.yaml
@ -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:
--- a/interest_rate_swaps/network/network.sh
+++ b/interest_rate_swaps/network/network.sh
@ -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
--- a/test-network-k8s/config/org1/core.yaml
+++ b/test-network-k8s/config/org1/core.yaml
--- a/test-network-k8s/config/org2/core.yaml
+++ b/test-network-k8s/config/org2/core.yaml
--- a/test-network/addOrg3/compose/compose-ca-org3.yaml
+++ b/test-network/addOrg3/compose/compose-ca-org3.yaml
@ -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
--- a/test-network/addOrg3/compose/compose-org3.yaml
+++ b/test-network/addOrg3/compose/compose-org3.yaml
@ -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:
@ -41,10 +40,10 @@ services:
      - CORE_PEER_LOCALMSPID=Org3MSP
      - CORE_METRICS_PROVIDER=prometheus
      - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={"peername":"peer0org1"}
-      - CORE_CHAINCODE_EXECUTETIMEOUT=300s      
+      - CORE_CHAINCODE_EXECUTETIMEOUT=300s
    volumes:
-        - ../../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com:/etc/hyperledger/fabric        
-        - peer0.org3.example.com:/var/hyperledger/production
+      - ../../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com:/etc/hyperledger/fabric
+      - peer0.org3.example.com:/var/hyperledger/production
    working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
    command: peer node start
    ports:
--- a/test-network/addOrg3/compose/docker/docker-compose-org3.yaml
+++ b/test-network/addOrg3/compose/docker/docker-compose-org3.yaml
@ -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:
--- a/test-network/addOrg3/compose/docker/peercfg/core.yaml
+++ b/test-network/addOrg3/compose/docker/peercfg/core.yaml
--- a/test-network/addOrg3/compose/podman/peercfg/core.yaml
+++ b/test-network/addOrg3/compose/podman/peercfg/core.yaml
--- a/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml
+++ b/test-network/addOrg3/compose/podman/podman-compose-ca-org3.yaml
@ -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
--- a/test-network/addOrg3/compose/podman/podman-compose-org3.yaml
+++ b/test-network/addOrg3/compose/podman/podman-compose-org3.yaml
@ -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:
@ -40,9 +39,9 @@ services:
      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org3.example.com:11051
      - CORE_PEER_LOCALMSPID=Org3MSP
    volumes:
-        - ../peercfg:/etc/hyperledger/peercfg
-        - ../../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com:/etc/hyperledger/fabric        
-        - peer0.org3.example.com:/var/hyperledger/production
+      - ../peercfg:/etc/hyperledger/peercfg
+      - ../../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com:/etc/hyperledger/fabric
+      - peer0.org3.example.com:/var/hyperledger/production
    working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
    command: peer node start
    ports:
--- a/test-network/compose/compose-ca.yaml
+++ b/test-network/compose/compose-ca.yaml
@ -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
--- a/test-network/compose/compose-test-net.yaml
+++ b/test-network/compose/compose-test-net.yaml
@ -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:
@ -48,9 +47,9 @@ services:
    working_dir: /root
    command: orderer
    volumes:
-        - ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp
-        - ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls
-        - orderer.example.com:/var/hyperledger/production/orderer
+      - ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp
+      - ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls
+      - orderer.example.com:/var/hyperledger/production/orderer
    ports:
      - 7050:7050
      - 7053:7053
@ -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:
@ -87,8 +86,8 @@ services:
      - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={"peername":"peer0org1"}
      - CORE_CHAINCODE_EXECUTETIMEOUT=300s
    volumes:
-        - ../organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com:/etc/hyperledger/fabric
-        - peer0.org1.example.com:/var/hyperledger/production
+      - ../organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com:/etc/hyperledger/fabric
+      - peer0.org1.example.com:/var/hyperledger/production
    working_dir: /root
    command: peer node start
    ports:
@ -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:
@ -120,14 +119,14 @@ services:
      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:9051
      - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:9051
      - CORE_PEER_LOCALMSPID=Org2MSP
-      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp      
+      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp
      - CORE_OPERATIONS_LISTENADDRESS=peer0.org2.example.com:9445
      - CORE_METRICS_PROVIDER=prometheus
      - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={"peername":"peer0org2"}
      - CORE_CHAINCODE_EXECUTETIMEOUT=300s
    volumes:
-        - ../organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com:/etc/hyperledger/fabric
-        - peer0.org2.example.com:/var/hyperledger/production
+      - ../organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com:/etc/hyperledger/fabric
+      - peer0.org2.example.com:/var/hyperledger/production
    working_dir: /root
    command: peer node start
    ports:
@ -151,8 +150,8 @@ services:
    working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
    command: /bin/bash
    volumes:
-        - ../organizations:/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations
-        - ../scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
+      - ../organizations:/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations
+      - ../scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
    depends_on:
      - peer0.org1.example.com
      - peer0.org2.example.com
--- a/test-network/compose/docker/docker-compose-test-net.yaml
+++ b/test-network/compose/docker/docker-compose-test-net.yaml
@ -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
--- a/test-network/compose/docker/peercfg/core.yaml
+++ b/test-network/compose/docker/peercfg/core.yaml
--- a/test-network/compose/podman/peercfg/core.yaml
+++ b/test-network/compose/podman/peercfg/core.yaml
--- a/test-network/network.sh
+++ b/test-network/network.sh
@ -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"