From a322bb0a50338aa321190c0c4bea8e98ada3d8a1 Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <Mark.S.Lewis@outlook.com>
Date: Sun, 23 Feb 2025 12:31:27 +0000
Subject: [PATCH] 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 <Mark.S.Lewis@outlook.com>
---
 .github/actions/fsat-setup/action.yaml         | 10 +++++-----
 .github/actions/test-network-setup/action.yaml | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml
index e40b8fcf..10a7cfa4 100644
--- a/.github/actions/fsat-setup/action.yaml
+++ b/.github/actions/fsat-setup/action.yaml
@@ -6,16 +6,16 @@ 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"
@@ -23,8 +23,8 @@ runs:
     - 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
diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml
index 42eb6d7f..fc3eca11 100644
--- a/.github/actions/test-network-setup/action.yaml
+++ b/.github/actions/test-network-setup/action.yaml
@@ -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
@@ -15,7 +15,7 @@ inputs:
     default: 2.5.11
   ca-version:
     description: Version of Hyperledger Fabric CA
-    default: 1.5.14
+    default: 1.5.15
 
 runs:
   using: "composite"
@@ -23,13 +23,13 @@ runs:
     - 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:
@@ -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