Skip to content

Commit b1c4c73

Browse files
Pull Fabric images from GitHub Container Registry
By default, Docker images are referenced from Docker Hub. This has now applied rate limiting that is causing builds to fail. Current Fabric v2.5 and chaincode container Docker images are also published to GitHub Container Registry, which does not impose rate limits and will be located closer to the GitHub Actions runners. This change: - Updates to latest Fabric component versions, which are available in GHCR. The Fabric install script defaults to GHCR as the Docker registry for versions that are available here. - Pulls and re-tags chaincode container images from GHCR in advance of running tests in the build. This avoids them being pulled from Docker Hub during test execution. Signed-off-by: Mark S. Lewis <[email protected]>
1 parent 8547618 commit b1c4c73

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

.github/actions/fsat-setup/action.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ inputs:
66
default: 18.x
77
just-version:
88
description: Just Version
9-
default: '1.24.0'
9+
default: "1.24.0"
1010
k9s-version:
1111
description: k9s Version
1212
default: v0.25.3
1313
fabric-version:
1414
description: Version of Hyperledger Fabric
15-
default: '2.5.11'
15+
default: "2.5.11"
1616
ca-version:
1717
description: Version of Hyperledger Fabric CA
18-
default: '1.5.14'
18+
default: "1.5.15"
1919

2020
runs:
2121
using: "composite"
2222
steps:
2323
- uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ inputs.node-version }}
26-
cache: 'npm'
27-
cache-dependency-path: '**/package-lock.json'
26+
cache: "npm"
27+
cache-dependency-path: "**/package-lock.json"
2828

2929
- name: Install k9s
3030
shell: bash

.github/actions/test-network-setup/action.yaml

+12-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
33
inputs:
44
go-version:
55
description: Version of go
6-
default: '1.23'
6+
default: "1.23"
77
node-version:
88
description: Version of node
99
default: 18.x
@@ -15,21 +15,21 @@ inputs:
1515
default: 2.5.11
1616
ca-version:
1717
description: Version of Hyperledger Fabric CA
18-
default: 1.5.14
18+
default: 1.5.15
1919

2020
runs:
2121
using: "composite"
2222
steps:
2323
- uses: actions/setup-go@v5
2424
with:
2525
go-version: ${{ inputs.go-version }}
26-
cache-dependency-path: '**/go.sum'
26+
cache-dependency-path: "**/go.sum"
2727

2828
- uses: actions/setup-node@v4
2929
with:
3030
node-version: ${{ inputs.node-version }}
31-
cache: 'npm'
32-
cache-dependency-path: '**/package-lock.json'
31+
cache: "npm"
32+
cache-dependency-path: "**/package-lock.json"
3333

3434
- uses: actions/setup-java@v4
3535
with:
@@ -50,6 +50,13 @@ runs:
5050
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
5151
| bash -s -- docker --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }}
5252
53+
- name: Pull chaincode container images
54+
run: |
55+
docker pull ghcr.io/hyperledger/fabric-nodeenv:2.5
56+
docker tag ghcr.io/hyperledger/fabric-nodeenv:2.5 hyperledger/fabric-nodeenv:2.5
57+
docker pull ghcr.io/hyperledger/fabric-javaenv:2.5
58+
docker tag ghcr.io/hyperledger/fabric-javaenv:2.5 hyperledger/fabric-javaenv:2.5
59+
5360
- name: Install retry CLI
5461
shell: bash
5562
run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry

0 commit comments

Comments
 (0)