diff --git a/Makefile b/Makefile index cd178429..015e59a1 100755 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ docker-rest-agent: 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) fabric: - docker build -t hyperledger/fabric:2.5.10 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/ + docker build -t hyperledger/fabric:2.5.13 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/ dashboard: docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./ diff --git a/build_image/docker/cello-hlf/Dockerfile b/build_image/docker/cello-hlf/Dockerfile index 3988edca..b36ac4d5 100644 --- a/build_image/docker/cello-hlf/Dockerfile +++ b/build_image/docker/cello-hlf/Dockerfile @@ -21,7 +21,7 @@ # Workdir is set to $GOPATH/src/github.com/hyperledger/fabric # Data is stored under /var/hyperledger/production -FROM golang:1.23.1 +FROM golang:1.24.2 LABEL maintainer="Baohua Yang " # Orderer, peer, ca, operation api @@ -34,10 +34,10 @@ ENV FABRIC_ROOT=$GOPATH/src/github.com/hyperledger/fabric \ FABRIC_CA_ROOT=$GOPATH/src/github.com/hyperledger/fabric-ca # BASE_VERSION is used in metadata.Version as major version -ENV BASE_VERSION=2.5.10 +ENV BASE_VERSION=2.5.13 # PROJECT_VERSION is required in core.yaml for fabric-baseos and fabric-ccenv -ENV PROJECT_VERSION=2.5.10 +ENV PROJECT_VERSION=2.5.13 ENV HLF_CA_VERSION=1.5.13 # generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node diff --git a/build_image/docker/common/api-engine/Dockerfile.in b/build_image/docker/common/api-engine/Dockerfile.in index dc625775..8cfba44b 100644 --- a/build_image/docker/common/api-engine/Dockerfile.in +++ b/build_image/docker/common/api-engine/Dockerfile.in @@ -11,7 +11,7 @@ RUN apt-get update \ WORKDIR /var/www/server # Install compiled code tools from Artifactory and copy it to opt folder. -RUN curl -L --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.10/hyperledger-fabric-linux-amd64-2.5.10.tar.gz" | tar xz -C /opt/ +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 /opt/ # Copy source code to the working dir COPY src/api-engine ./ diff --git a/src/api-engine/api/config.py b/src/api-engine/api/config.py index aed82409..d63a6c5b 100644 --- a/src/api-engine/api/config.py +++ b/src/api-engine/api/config.py @@ -13,4 +13,4 @@ FABRIC_CHAINCODE_STORE = "/opt/cello/chaincode" -FABRIC_VERSION = "2.5.10" +FABRIC_VERSION = "2.5.13" diff --git a/src/api-engine/api/lib/agent/docker/handler.py b/src/api-engine/api/lib/agent/docker/handler.py index 0544fb2f..58f6342e 100644 --- a/src/api-engine/api/lib/agent/docker/handler.py +++ b/src/api-engine/api/lib/agent/docker/handler.py @@ -44,7 +44,7 @@ def create(self, info): "tls": info.get("tls")[2:-1], "peer_config_file": info.get("config_file")[2:-1], "orderer_config_file": info.get("config_file")[2:-1], - "img": "hyperledger/fabric:2.5.10", + "img": "hyperledger/fabric:2.5.13", "cmd": ( 'bash /tmp/init.sh "peer node start"' if info.get("type") == "peer"