Skip to content

Commit

Permalink
Pull Fabric images from GitHub Container Registry (#1307)
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
bestbeforetoday authored Feb 23, 2025
1 parent 8547618 commit aa0c9d3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/actions/fsat-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ inputs:
default: 18.x
just-version:
description: Just Version
default: '1.24.0'
default: "1.24.0"
k9s-version:
description: k9s Version
default: v0.25.3
fabric-version:
description: Version of Hyperledger Fabric
default: '2.5.11'
default: "2.5.11"
ca-version:
description: Version of Hyperledger Fabric CA
default: '1.5.14'
default: "1.5.15"

runs:
using: "composite"
steps:
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

- name: Install k9s
shell: bash
Expand Down
18 changes: 13 additions & 5 deletions .github/actions/test-network-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
inputs:
go-version:
description: Version of go
default: '1.23'
default: "1.23"
node-version:
description: Version of node
default: 18.x
Expand All @@ -15,21 +15,21 @@ inputs:
default: 2.5.11
ca-version:
description: Version of Hyperledger Fabric CA
default: 1.5.14
default: 1.5.15

runs:
using: "composite"
steps:
- uses: actions/setup-go@v5
with:
go-version: ${{ inputs.go-version }}
cache-dependency-path: '**/go.sum'
cache-dependency-path: "**/go.sum"

- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
cache: "npm"
cache-dependency-path: "**/package-lock.json"

- uses: actions/setup-java@v4
with:
Expand All @@ -50,6 +50,14 @@ runs:
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
| bash -s -- docker --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }}
- name: Pull chaincode container images
shell: bash
run: |
docker pull ghcr.io/hyperledger/fabric-nodeenv:2.5
docker tag ghcr.io/hyperledger/fabric-nodeenv:2.5 hyperledger/fabric-nodeenv:2.5
docker pull ghcr.io/hyperledger/fabric-javaenv:2.5
docker tag ghcr.io/hyperledger/fabric-javaenv:2.5 hyperledger/fabric-javaenv:2.5
- name: Install retry CLI
shell: bash
run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry

0 comments on commit aa0c9d3

Please sign in to comment.