Update firefly docker image name in build script in isolation

.github/workflows/go.yml

@@ -60,7 +60,7 @@ jobs:
         run: make docker
 
       - name: Save Docker image
-        run: docker save --output firefly.tar.gz hyperledger/firefly
+        run: docker save --output firefly.tar.gz hyperledger-firefly/firefly
 
       - name: Upload Docker image
         uses: actions/upload-artifact@v4
@@ -156,6 +156,10 @@ jobs:
       - name: Load Docker image
         run: docker load --input firefly.tar.gz
 
+      # Temporary to pass e2e jobs during migration
+      - name: Re-tag Docker image
+        run: docker tag hyperledger-firefly/firefly hyperledger/firefly
+
       # Pre-pull fabric-ccenv so the Fabric peer's chaincode build finds it. Required on
       # GitHub Actions with Docker 29: the peer invokes the host Docker build API to build
       # chaincode (FROM hyperledger/fabric-ccenv:2.5); with Docker 29/containerd image store

.trivyignore

@@ -0,0 +1 @@
+GO-2026-5932

Dockerfile

@@ -66,9 +66,9 @@ FROM alpine:3.21 AS sbom
 WORKDIR /
 ADD . /SBOM
 RUN apk add --no-cache curl
-RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.69.3
+RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.72.0
 RUN trivy fs --format spdx-json --output /sbom.spdx.json /SBOM
-RUN trivy sbom /sbom.spdx.json --severity UNKNOWN,HIGH,CRITICAL --db-repository public.ecr.aws/aquasecurity/trivy-db --exit-code 1
+RUN trivy sbom /sbom.spdx.json --ignorefile /SBOM/.trivyignore --severity UNKNOWN,HIGH,CRITICAL --db-repository public.ecr.aws/aquasecurity/trivy-db --exit-code 1
 
 # Final executable build
 FROM $BASE_TAG

docker_build.sh

@@ -50,7 +50,7 @@ docker buildx rm firefly --keep-state 2>/dev/null || true
 # Create new firefly builder
 docker buildx create --name firefly --use
 docker buildx build \
-    -t hyperledger/firefly \
+    -t hyperledger-firefly/firefly \
     --build-arg FIREFLY_BUILDER_TAG=$FIREFLY_BUILDER_TAG \
     --build-arg FABRIC_BUILDER_TAG=$FABRIC_BUILDER_TAG \
     --build-arg FABRIC_BUILDER_PLATFORM=$FABRIC_BUILDER_PLATFORM \

manifest.json

@@ -1,53 +1,53 @@
 {
   "cardanoconnect": {
-    "image": "ghcr.io/hyperledger/firefly-cardanoconnect",
-    "tag": "v0.6.1",
-    "sha": "6a7c0534cf08b1afcce56a8234f1da3ef08594b3cbf27d4a9ee84bf4ecd096dd"
+    "image": "ghcr.io/hyperledger-firefly/cardanoconnect",
+    "tag": "v0.7.0",
+    "sha": "f160b86db3c33a2884012a7e119ea8c755ad15b0fb3c204a82df106a4a35cd35"
   },
   "cardanosigner": {
-    "image": "ghcr.io/hyperledger/firefly-cardanosigner",
-    "tag": "v0.6.1",
-    "sha": "b950c1d902d58f132f69f5b10aeb1623732de8db4d223534797be87766f123e9"
+    "image": "ghcr.io/hyperledger-firefly/cardanosigner",
+    "tag": "v0.7.0",
+    "sha": "a695530c5714574efd9075dd1afa60f75b8358d51d5204e28d2ef453f2e001d2"
   },
   "ethconnect": {
-    "image": "ghcr.io/hyperledger/firefly-ethconnect",
-    "tag": "v3.3.3",
-    "sha": "250509a54bbd3251598a807071b388492c0157df02a3b06bfa64e14e791c0633"
+    "image": "ghcr.io/hyperledger-firefly/ethconnect",
+    "tag": "v3.4.0",
+    "sha": "46685225660ed2f6dc8e5cee04508d3d3cdfc205d5fd1463ef22ec90410f4bbf"
   },
   "evmconnect": {
-    "image": "ghcr.io/hyperledger/firefly-evmconnect",
-    "tag": "v1.4.0",
-    "sha": "5af81620813b087d4e4fd2efbede7f27383c783d93d9c0cb142de700db0f7177"
+    "image": "ghcr.io/hyperledger-firefly/evmconnect",
+    "tag": "v1.5.1",
+    "sha": "ca6e3860c784477cd800bcbf00506310a31992468bd5b2c1f4bd2a1317d2b03b"
   },
   "fabconnect": {
-    "image": "ghcr.io/hyperledger/firefly-fabconnect",
-    "tag": "v0.9.23",
-    "sha": "a52dd8c60802562a3752015480af590b7f350fc165297c62a077394d7c49557c"
+    "image": "ghcr.io/hyperledger-firefly/fabconnect",
+    "tag": "v0.10.0",
+    "sha": "ef7085d109453819ed9e80bb07acdd62bd2d4b0658789333a4308f9308c7d904"
   },
   "tezosconnect": {
-    "image": "ghcr.io/hyperledger/firefly-tezosconnect",
-    "tag": "v0.2.9",
-    "sha": "cc77e88032ae4afc33c419b58f5b042bc18ad1a193ee9d364455b9cbabd85cd9"
+    "image": "ghcr.io/hyperledger-firefly/tezosconnect",
+    "tag": "v0.3.0",
+    "sha": "115796e78fe0014b0527af4033783635950d1c6844b5fdebe92825bf46ae19a3"
   },
   "dataexchange-https": {
-    "image": "ghcr.io/hyperledger/firefly-dataexchange-https",
-    "tag": "v1.3.2",
-    "sha": "6b6a8df8845cd19d06ea2af0f58028bcd9d480a42bdc9cfe374e01346d89791a"
+    "image": "ghcr.io/hyperledger-firefly/dataexchange-https",
+    "tag": "v1.4.0",
+    "sha": "cb546a0dded32bf6a6a3ecfd8e8232cd94dd46959e7eccad4e150831d79e36e5"
   },
   "tokens-erc1155": {
-    "image": "ghcr.io/hyperledger/firefly-tokens-erc1155",
+    "image": "ghcr.io/hyperledger-firefly/tokens-erc1155",
     "tag": "v1.3.6",
     "sha": "7a5c31cbfa29f17182dd09e360638e5df1123b485151d8a5fccd50e7a4179e87"
   },
   "tokens-erc20-erc721": {
-    "image": "ghcr.io/hyperledger/firefly-tokens-erc20-erc721",
-    "tag": "v1.3.6",
-    "sha": "29daced3498a24191aa354fd204860492a4089335fb99cfb258bba685446ea1f"
+    "image": "ghcr.io/hyperledger-firefly/tokens-erc20-erc721",
+    "tag": "v1.3.7",
+    "sha": "732ae187e8281657bbee6c2c9f968a256cf1ae1187ee7cb1fc1559c9925e1667"
   },
   "signer": {
-    "image": "ghcr.io/hyperledger/firefly-signer",
-    "tag": "v1.1.22",
-    "sha": "00e7aaac049f3e3f80644cea3394e4efa4180a195fa2f71d2e2ca57f8e6f2ec9"
+    "image": "ghcr.io/hyperledger-firefly/signer",
+    "tag": "v1.2.1",
+    "sha": "412236dfab0416ae3d60f4fecb311b067664a9dd4f16073856eb79a25f4c532f"
   },
   "build": {
     "firefly-builder": {

manifestgen.sh

@@ -45,10 +45,10 @@ function repository_url() {
     service=$1
     case $service in
         cardano*)
-            echo "https://api.github.com/repos/hyperledger/firefly-cardano"
+            echo "https://api.github.com/repos/hyperledger-firefly/cardano"
             ;;
         *)
-            echo "https://api.github.com/repos/hyperledger/firefly-$service"
+            echo "https://api.github.com/repos/hyperledger-firefly/$service"
             ;;
     esac
 }
@@ -72,7 +72,7 @@ echo "{" >> manifest.json
 for (( i=0; i<${SERVICE_COUNT}; i++ ))
 do
     echo "  \"${SERVICES[$i]}\": {" >> manifest.json
-    echo "    \"image\": \"ghcr.io/hyperledger/firefly-${SERVICES[$i]}\"," >> manifest.json
+    echo "    \"image\": \"ghcr.io/hyperledger-firefly/${SERVICES[$i]}\"," >> manifest.json
 
     if [ $USE_HEAD = false ] ; then
         # Query GitHub API the latest release version
@@ -83,9 +83,9 @@ do
     fi
 
     # Attempt to pull the image from GitHub Container Repository
-    docker pull ghcr.io/hyperledger/firefly-${SERVICES[$i]}:$TAG
+    docker pull ghcr.io/hyperledger-firefly/${SERVICES[$i]}:$TAG
     # Get the SHA of the downloaded image
-    SHA=$(docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/hyperledger/firefly-${SERVICES[$i]}:$TAG | cut -d ':' -f 2)
+    SHA=$(docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/hyperledger-firefly/${SERVICES[$i]}:$TAG | cut -d ':' -f 2)
     # Get the tag / build number name of this image from its label
     TAG_LABEL=$(docker inspect --format='{{index .Config.Labels "tag"}}' ghcr.io/hyperledger/firefly-${SERVICES[$i]}:$TAG)