Skip to content

Commit c3a5710

Browse files
committed
Bump fabric to 2.5.14 and go to 1.25.5
I encountered an issue after upgrading my Docker engine to version 29, and it seems to be caused by hyperledger/fabric#5350. Thus, I upgrade Hyperledger Fabric to 2.5.14 and go to 1.25.5 before I realized that the merge fix PR hyperledger/fabric#5355 hasn't been included in a Hyperledger Fabric release yet. Although I ended up downgrading my Docker engine to version 28, still, I commit my changes to these dependencies anyway. Signed-off-by: dodo920306 <[email protected]>
1 parent ddcef94 commit c3a5710

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ docker-rest-agent:
224224
docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH)
225225

226226
fabric:
227-
docker build -t hyperledger/fabric:2.5.13 src/nodes/hyperledger-fabric
227+
docker build -t hyperledger/fabric:2.5.14 src/nodes/hyperledger-fabric
228228

229229
dashboard:
230230
docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./

src/api-engine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN apt-get update\
1212
COPY . .
1313

1414
# Install compiled code tools from Artifactory and copy it to opt folder.
15-
RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.13/hyperledger-fabric-linux-amd64-2.5.13.tar.gz" | tar xz -C ./cello/
15+
RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.14/hyperledger-fabric-linux-amd64-2.5.14.tar.gz" | tar xz -C ./cello/
1616

1717
# Install python dependencies
1818
RUN pip3 install -r requirements.txt
1919

2020
# Install go
21-
ENV GO_VERSION=1.24.0
21+
ENV GO_VERSION=1.25.5
2222
RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz \
2323
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz \
2424
&& rm go${GO_VERSION}.linux-amd64.tar.gz

src/api-engine/api_engine/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,4 @@
258258
FABRIC_PEER_CFG = os.path.join(FABRIC_CFG, "core.yaml.bak")
259259
FABRIC_ORDERER_CFG = os.path.join(FABRIC_CFG, "orderer.yaml.bak")
260260

261-
FABRIC_VERSION = "2.5.13"
261+
FABRIC_VERSION = "2.5.14"

src/nodes/hyperledger-fabric/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Workdir is set to $GOPATH/src/github.com/hyperledger/fabric
2222
# Data is stored under /var/hyperledger/production
2323

24-
FROM golang:1.24.2
24+
FROM golang:1.25.5
2525
LABEL maintainer="Baohua Yang <yeasy.github.com>"
2626

2727
# Orderer, peer, ca, operation api
@@ -34,11 +34,11 @@ ENV FABRIC_ROOT=$GOPATH/src/github.com/hyperledger/fabric \
3434
FABRIC_CA_ROOT=$GOPATH/src/github.com/hyperledger/fabric-ca
3535

3636
# BASE_VERSION is used in metadata.Version as major version
37-
ENV BASE_VERSION=2.5.13
37+
ENV BASE_VERSION=2.5.14
3838

3939
# PROJECT_VERSION is required in core.yaml for fabric-baseos and fabric-ccenv
40-
ENV PROJECT_VERSION=2.5.13
41-
ENV HLF_CA_VERSION=1.5.13
40+
ENV PROJECT_VERSION=2.5.14
41+
ENV HLF_CA_VERSION=1.5.16
4242

4343
# generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node
4444
ENV DOCKER_NS=hyperledger
@@ -95,13 +95,12 @@ RUN apt-get update \
9595
ENV PATH="/opt/venv/bin:$PATH"
9696

9797
# Install yq to update config for fabric-ca
98-
RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/2.4.1/yq_linux_amd64 \
98+
RUN wget -O /go/bin/yq https://github.com/mikefarah/yq/releases/download/v4.50.1/yq_linux_amd64 \
9999
&& chmod a+x /go/bin/yq
100100

101101
# Install gotools
102-
RUN go install github.com/golang/protobuf/protoc-gen-go@latest \
102+
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@latest \
103103
&& go install github.com/maxbrunsfeld/counterfeiter/v6@latest \
104-
&& go install github.com/axw/gocov/gocov@latest \
105104
&& go install golang.org/x/tools/cmd/goimports@latest \
106105
&& go install github.com/onsi/ginkgo/ginkgo@latest
107106

0 commit comments

Comments
 (0)