mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-17 15:35:09 +00:00
Pull Fabric images from GitHub Container Registry (#1307)
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 <Mark.S.Lewis@outlook.com>
This commit is contained in:
parent
8547618f06
commit
aa0c9d3004
2 changed files with 18 additions and 10 deletions
10
.github/actions/fsat-setup/action.yaml
vendored
10
.github/actions/fsat-setup/action.yaml
vendored
|
|
@ -6,16 +6,16 @@ inputs:
|
||||||
default: 18.x
|
default: 18.x
|
||||||
just-version:
|
just-version:
|
||||||
description: Just Version
|
description: Just Version
|
||||||
default: '1.24.0'
|
default: "1.24.0"
|
||||||
k9s-version:
|
k9s-version:
|
||||||
description: k9s Version
|
description: k9s Version
|
||||||
default: v0.25.3
|
default: v0.25.3
|
||||||
fabric-version:
|
fabric-version:
|
||||||
description: Version of Hyperledger Fabric
|
description: Version of Hyperledger Fabric
|
||||||
default: '2.5.11'
|
default: "2.5.11"
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: '1.5.14'
|
default: "1.5.15"
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
|
|
@ -23,8 +23,8 @@ runs:
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ inputs.node-version }}
|
node-version: ${{ inputs.node-version }}
|
||||||
cache: 'npm'
|
cache: "npm"
|
||||||
cache-dependency-path: '**/package-lock.json'
|
cache-dependency-path: "**/package-lock.json"
|
||||||
|
|
||||||
- name: Install k9s
|
- name: Install k9s
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
||||||
18
.github/actions/test-network-setup/action.yaml
vendored
18
.github/actions/test-network-setup/action.yaml
vendored
|
|
@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
|
||||||
inputs:
|
inputs:
|
||||||
go-version:
|
go-version:
|
||||||
description: Version of go
|
description: Version of go
|
||||||
default: '1.23'
|
default: "1.23"
|
||||||
node-version:
|
node-version:
|
||||||
description: Version of node
|
description: Version of node
|
||||||
default: 18.x
|
default: 18.x
|
||||||
|
|
@ -15,7 +15,7 @@ inputs:
|
||||||
default: 2.5.11
|
default: 2.5.11
|
||||||
ca-version:
|
ca-version:
|
||||||
description: Version of Hyperledger Fabric CA
|
description: Version of Hyperledger Fabric CA
|
||||||
default: 1.5.14
|
default: 1.5.15
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
|
|
@ -23,13 +23,13 @@ runs:
|
||||||
- uses: actions/setup-go@v5
|
- uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: ${{ inputs.go-version }}
|
go-version: ${{ inputs.go-version }}
|
||||||
cache-dependency-path: '**/go.sum'
|
cache-dependency-path: "**/go.sum"
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ inputs.node-version }}
|
node-version: ${{ inputs.node-version }}
|
||||||
cache: 'npm'
|
cache: "npm"
|
||||||
cache-dependency-path: '**/package-lock.json'
|
cache-dependency-path: "**/package-lock.json"
|
||||||
|
|
||||||
- uses: actions/setup-java@v4
|
- uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
|
@ -50,6 +50,14 @@ runs:
|
||||||
curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \
|
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 }}
|
| 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
|
- name: Install retry CLI
|
||||||
shell: bash
|
shell: bash
|
||||||
run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry
|
run: curl -sSL https://raw.githubusercontent.com/kadwanev/retry/master/retry -o ./bin/retry && chmod +x ./bin/retry
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue