Update tools and dependencies in Docker image

.github/workflows/pr.yml

@@ -22,19 +22,19 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 25
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
       - name: Install Fabric dependencies
         run: |
           sudo mkdir -p /opt/fabric
           pushd /opt/fabric
-          curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary --fabric-version 2.5.10 --ca-version 1.5.13
+          curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary --fabric-version 2.5.16 --ca-version 1.5.22
           popd
           cd builders/java
           sudo mvn -q dependency:copy-dependencies -DoutputDirectory=/opt/fabric-chaincode-java/lib
-          npm install -g fabric-shim@2.5.7
+          npm install -g fabric-shim@2.5.8
       - name: Run Go formatters and linters
         run: make lint
       - name: Run Go unit tests

Dockerfile2

@@ -2,27 +2,38 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-FROM debian:bookworm-slim AS builder
+ARG GO_VERSION=1.27.1
+ARG FABRIC_VERSION=2.5.16
+ARG FABRIC_CA_VERSION=1.5.22
+ARG COUCHDB_VERSION=3.5
+ARG NODE_VERSION=24.21.0
+ARG GRADLE_VERSION=9.8.0
+ARG MAVEN_VERSION=3.9.16
+ARG NODE_FABRIC_SHIM_VERSION=2.5.8
+
+FROM debian:trixie AS builder
 ENV DEBIAN_FRONTEND=noninteractive
 
 ARG TARGETARCH
 ARG TARGETOS
 
+ARG GO_VERSION
+ARG FABRIC_VERSION
+ARG FABRIC_CA_VERSION
+
 # Build tools
 RUN apt-get update \
-    && apt-get -y install build-essential gcc gzip \
-    && apt-get -y install python3 python3-distutils libpython3-dev software-properties-common \
-    && apt-get -y install curl git jq unzip moreutils
+    && apt-get -y install build-essential curl git jq unzip
 
-RUN curl -sL https://go.dev/dl/go1.23.3.${TARGETOS}-${TARGETARCH}.tar.gz | tar zxf - -C /usr/local
+RUN curl -sSL https://go.dev/dl/go${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz | tar zxf - -C /usr/local
 ENV PATH="/usr/local/go/bin:$PATH"
 
 ENV GOROOT=/usr/local/go
 ENV GOPATH=/tmp/go
 
 WORKDIR $GOPATH/src/github.com/hyperledger
-RUN git clone --depth 1 --branch release-2.5 https://github.com/hyperledger/fabric.git \
-    && git clone --depth 1 --branch v1.5.13 https://github.com/hyperledger/fabric-ca.git
+RUN git clone --depth 1 --branch v${FABRIC_VERSION} https://github.com/hyperledger/fabric.git \
+    && git clone --depth 1 --branch v${FABRIC_CA_VERSION} https://github.com/hyperledger/fabric-ca.git
 WORKDIR $GOPATH/src/github.com/hyperledger/fabric
 ENV CGO_ENABLED=0
 RUN make orderer \
@@ -39,14 +50,20 @@ ADD . $GOPATH/src/github.com/hyperledger-labs/microfab
 RUN go build -o microfabd cmd/microfabd/main.go
 
 WORKDIR /fabric
-RUN curl -sSL https://github.com/hyperledger/fabric/releases/download/v2.5.10/hyperledger-fabric-linux-amd64-2.5.10.tar.gz | tar xzf - config
+RUN curl -sSL https://github.com/hyperledger/fabric/releases/download/v${FABRIC_VERSION}/hyperledger-fabric-linux-amd64-${FABRIC_VERSION}.tar.gz | tar xzf - config
 
-FROM couchdb:3.4
+FROM couchdb:${COUCHDB_VERSION}
 
 # Though they are populated by docker buildx, the ARG reference is required to make them available for use
 ARG TARGETARCH
 ARG TARGETOS
 
+ARG GO_VERSION
+ARG NODE_VERSION
+ARG GRADLE_VERSION
+ARG MAVEN_VERSION
+ARG NODE_FABRIC_SHIM_VERSION
+
 RUN apt-get update && apt-get install -y \
     jq xz-utils unzip vim \
     && rm -rf /var/lib/apt/lists/*
@@ -57,16 +74,16 @@ RUN groupadd -g 7051 microfab \
     && chown -R microfab:microfab /home/microfab
 
 RUN mkdir -p /opt/go /opt/node /opt/java   \
-    && curl -sSL https://dl.google.com/go/go1.23.3.$TARGETOS-$TARGETARCH.tar.gz | tar xzf - -C /opt/go --strip-components=1
+    && curl -sSL https://go.dev/dl/go${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz | tar xzf - -C /opt/go --strip-components=1
+
+COPY --from=eclipse-temurin:25-jdk /opt/java/openjdk /opt/java
 
 RUN if [ "${TARGETARCH}" = "amd64" ]; then ARCH=x64 \
-    && curl -sSL https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_${ARCH}_${TARGETOS}_hotspot_21.0.5_11.tar.gz | tar xzf - -C /opt/java --strip-components=1 \
-    && curl -sSL https://nodejs.org/download/release/v22.11.0/node-v22.11.0-${TARGETOS}-${ARCH}.tar.xz | tar xJf - -C /opt/node --strip-components=1 \
+    && curl -sSL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${TARGETOS}-${ARCH}.tar.xz | tar xJf - -C /opt/node --strip-components=1 \
     ; elif [ "${TARGETARCH}" = "arm64" ]; then ARCH=aarch64 \
-    && curl -sSL https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_${ARCH}_${TARGETOS}_hotspot_21.0.5_11.tar.gz | tar xzf - -C /opt/java --strip-components=1 \
-    && curl -sSL https://nodejs.org/download/release/v22.11.0/node-v22.11.0-${TARGETOS}-${TARGETARCH}.tar.xz | tar xJf - -C /opt/node --strip-components=1 \
+    && curl -sSL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-${TARGETOS}-${TARGETARCH}.tar.xz | tar xJf - -C /opt/node --strip-components=1 \
     ; fi
-
+    
 COPY docker/local.ini /opt/couchdb/etc/local.d/local.ini
 COPY docker/docker-entrypoint.sh /usr/local/bin
 COPY --from=builder /tmp/go/src/github.com/hyperledger/fabric/build/bin/* /usr/local/bin/
@@ -83,19 +100,18 @@ ENV FABRIC_CFG_PATH=/etc/hyperledger/fabric
 ENV MICROFAB_HOME=/home/microfab
 ENV PATH=/opt/go/bin:/opt/node/bin:/opt/java/bin:/opt/couchdb/bin:${PATH}
 
-
-RUN curl -sSL -o /tmp/gradle.zip https://services.gradle.org/distributions/gradle-8.11.1-bin.zip \
+RUN curl -sSL -o /tmp/gradle.zip https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip \
     && unzip -qq /tmp/gradle.zip -d /opt \
-    && mv /opt/gradle-8.11.1 /opt/gradle \
+    && mv /opt/gradle-${GRADLE_VERSION} /opt/gradle \
     && rm -f /tmp/gradle.zip \
-    && curl -sSL https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz | tar xzf - -C /opt \
-    && mv /opt/apache-maven-3.9.9 /opt/maven
+    && curl -sSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar xzf - -C /opt \
+    && mv /opt/apache-maven-${MAVEN_VERSION} /opt/maven
 ENV PATH=/opt/gradle/bin:/opt/maven/bin:${PATH}
 ADD builders/java/pom.xml /opt/fabric-chaincode-java/
 
 RUN cd /opt/fabric-chaincode-java \
     && mvn -q dependency:copy-dependencies -DoutputDirectory=/opt/fabric-chaincode-java/lib \
-    && npm install --unsafe-perm -g fabric-shim@2.5.7 \
+    && npm install --unsafe-perm -g fabric-shim@${NODE_FABRIC_SHIM_VERSION} \
     && rm -rf /tmp/gocache /tmp/goenv /tmp/go /tmp/maven /tmp/npm-cache /tmp/npm-devdir
 
 RUN chmod 666 /etc/passwd

builders/java/pom.xml

@@ -11,14 +11,8 @@
     <dependency>
       <groupId>org.hyperledger.fabric-chaincode-java</groupId>
       <artifactId>fabric-chaincode-shim</artifactId>
-      <version>2.4.1</version>
+      <version>2.5.11</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
-  <repositories>
-		<repository>
-		    <id>jitpack.io</id>
-		    <url>https://jitpack.io</url>
-		</repository>
-	</repositories>
 </project>

internal/pkg/configtxlator/update.go

@@ -166,23 +166,23 @@ func computeGroupUpdate(original, updated *cb.ConfigGroup) (readSet, writeSet *c
 			len(readSetGroups) == 0 &&
 			len(writeSetGroups) == 0 {
 			return &cb.ConfigGroup{
-					Version: original.Version,
-				}, &cb.ConfigGroup{
-					Version: original.Version,
-				}, false
+				Version: original.Version,
+			}, &cb.ConfigGroup{
+				Version: original.Version,
+			}, false
 		}
 
 		return &cb.ConfigGroup{
-				Version:  original.Version,
-				Policies: readSetPolicies,
-				Values:   readSetValues,
-				Groups:   readSetGroups,
-			}, &cb.ConfigGroup{
-				Version:  original.Version,
-				Policies: writeSetPolicies,
-				Values:   writeSetValues,
-				Groups:   writeSetGroups,
-			}, true
+			Version:  original.Version,
+			Policies: readSetPolicies,
+			Values:   readSetValues,
+			Groups:   readSetGroups,
+		}, &cb.ConfigGroup{
+			Version:  original.Version,
+			Policies: writeSetPolicies,
+			Values:   writeSetValues,
+			Groups:   writeSetGroups,
+		}, true
 	}
 
 	for k, samePolicy := range sameSetPolicies {
@@ -201,17 +201,17 @@ func computeGroupUpdate(original, updated *cb.ConfigGroup) (readSet, writeSet *c
 	}
 
 	return &cb.ConfigGroup{
-			Version:  original.Version,
-			Policies: readSetPolicies,
-			Values:   readSetValues,
-			Groups:   readSetGroups,
-		}, &cb.ConfigGroup{
-			Version:   original.Version + 1,
-			Policies:  writeSetPolicies,
-			Values:    writeSetValues,
-			Groups:    writeSetGroups,
-			ModPolicy: updated.ModPolicy,
-		}, true
+		Version:  original.Version,
+		Policies: readSetPolicies,
+		Values:   readSetValues,
+		Groups:   readSetGroups,
+	}, &cb.ConfigGroup{
+		Version:   original.Version + 1,
+		Policies:  writeSetPolicies,
+		Values:    writeSetValues,
+		Groups:    writeSetGroups,
+		ModPolicy: updated.ModPolicy,
+	}, true
 }
 
 // Compute computes a config update between the specified original and updated config.

pkg/microfab/util.go

@@ -62,7 +62,7 @@ func DownloadImage(microFabImage string) error {
 			var s PullStatus
 			json.Unmarshal(buf.Bytes(), &s)
 			if strings.HasPrefix(s.Status, "Status: Downloaded") {
-				log.Printf(s.Status)
+				log.Print(s.Status)
 			}
 
 		}