diff --git a/docs/setup-option2.md b/docs/setup-option2.md index e5844768e..3b7996e9a 100644 --- a/docs/setup-option2.md +++ b/docs/setup-option2.md @@ -10,7 +10,7 @@ Make sure that you have the following required dependencies installed: * CMake v3.5.1 or higher -* [Go](https://golang.org/) 1.21.x or higher +* [Go](https://golang.org/) 1.23.x or higher * Docker 18.09 (or higher) and docker-compose 1.25.x (or higher) Note that version from Ubuntu 18.04 is not recent enough! To upgrade, install a recent version following the instructions from [docker.com](https://docs.docker.com/compose/install/), e.g., for version 1.25.4 execute diff --git a/ecc_go/README.md b/ecc_go/README.md index 18d912706..fbbfb7396 100644 --- a/ecc_go/README.md +++ b/ecc_go/README.md @@ -80,8 +80,8 @@ Install ego by running the following: ```bash wget -qO- https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add add-apt-repository "deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu `lsb_release -cs` main" -wget https://github.com/edgelesssys/ego/releases/download/v1.5.3/ego_1.5.3_amd64_ubuntu-22.04.deb -apt install ./ego_1.5.3_amd64_ubuntu-22.04.deb build-essential libssl-dev +wget https://github.com/edgelesssys/ego/releases/download/v1.7.0/ego_1.7.0_amd64_ubuntu-22.04.deb +apt install ./ego_1.7.0_amd64_ubuntu-22.04.deb build-essential libssl-dev ``` You can find more information about ego installation on the official [documentation](https://docs.edgeless.systems/ego/#/getting-started/install). diff --git a/go.mod b/go.mod index aedbf53fa..fd0bd30cb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric-private-chaincode -go 1.21 +go 1.23.5 // Note: // - fabric has a go.mod but the normal tagging, e.g., v2.2.0 does NOT diff --git a/integration/go_chaincode/go.mod b/integration/go_chaincode/go.mod index 0c72ec57e..c1f66a3c3 100644 --- a/integration/go_chaincode/go.mod +++ b/integration/go_chaincode/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric-private-chaincode/integration/go_chaincode -go 1.21 +go 1.23.5 replace ( github.com/btcsuite/btcd v0.23.4 => github.com/btcsuite/btcd v0.22.1 diff --git a/samples/application/ccapi/Dockerfile b/samples/application/ccapi/Dockerfile index 9fb488eef..40b821190 100644 --- a/samples/application/ccapi/Dockerfile +++ b/samples/application/ccapi/Dockerfile @@ -1,5 +1,5 @@ # Use an official Golang runtime as a parent image -FROM golang:1.21-alpine AS build +FROM golang:1.23-alpine AS build ENV PATH="${PATH}:/usr/bin/" diff --git a/samples/application/ccapi/go.mod b/samples/application/ccapi/go.mod index a8dbeaa9c..f0c3cd922 100644 --- a/samples/application/ccapi/go.mod +++ b/samples/application/ccapi/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric-private-chaincode/samples/application/ccapi -go 1.21 +go 1.23.5 require ( github.com/gin-contrib/cors v1.4.0 diff --git a/samples/demos/irb/go.mod b/samples/demos/irb/go.mod index 6a8b5d38e..dd3a75fd9 100644 --- a/samples/demos/irb/go.mod +++ b/samples/demos/irb/go.mod @@ -1,6 +1,6 @@ module github.com/hyperledger/fabric-private-chaincode/samples/demos/irb -go 1.21 +go 1.23.5 replace ( github.com/hyperledger-labs/orion-sdk-go => github.com/hyperledger-labs/orion-sdk-go v0.2.5 diff --git a/samples/deployment/fabric-smart-client/the-simple-testing-network/go.mod b/samples/deployment/fabric-smart-client/the-simple-testing-network/go.mod index 15ccac383..49945c94e 100644 --- a/samples/deployment/fabric-smart-client/the-simple-testing-network/go.mod +++ b/samples/deployment/fabric-smart-client/the-simple-testing-network/go.mod @@ -1,6 +1,6 @@ module the-simple-testing-network -go 1.21 +go 1.23.5 replace ( github.com/hyperledger-labs/orion-sdk-go => github.com/hyperledger-labs/orion-sdk-go v0.2.5 diff --git a/utils/docker/base-dev/Dockerfile b/utils/docker/base-dev/Dockerfile index 31a9e8798..228e0f794 100644 --- a/utils/docker/base-dev/Dockerfile +++ b/utils/docker/base-dev/Dockerfile @@ -21,12 +21,12 @@ FROM hyperledger/fabric-private-chaincode-base-rt:${FPC_VERSION} as common LABEL org.opencontainers.image.source https://github.com/hyperledger/fabric-private-chaincode # config/build params -ARG GO_VERSION=1.21.9 +ARG GO_VERSION=1.23.5 ARG NANOPB_VERSION=0.4.7 ARG OPENSSL_VERSION=3.0.12 ARG SGXSSL_VERSION=3.0_Rev1 ARG APT_ADD_PKGS= -ARG EGO_VERSION=1.5.3 +ARG EGO_VERSION=1.7.0 # for convenience remember all versions as env variables .. ENV GO_VERSION=${GO_VERSION} @@ -39,32 +39,32 @@ ENV DEBIAN_FRONTEND "noninteractive" WORKDIR /tmp RUN apt-get update -q \ - && apt-get install -y -q \ - build-essential \ - clang-format \ - cmake \ - git \ - libcurl4-openssl-dev \ - libprotobuf-dev \ - libssl-dev \ - libtool \ - pkg-config \ - python-is-python3 \ - protobuf-compiler \ - python3-protobuf \ - psmisc \ - bc \ - software-properties-common \ - ${APT_ADD_PKGS} + && apt-get install -y -q \ + build-essential \ + clang-format \ + cmake \ + git \ + libcurl4-openssl-dev \ + libprotobuf-dev \ + libssl-dev \ + libtool \ + pkg-config \ + python-is-python3 \ + protobuf-compiler \ + python3-protobuf \ + psmisc \ + bc \ + software-properties-common \ + ${APT_ADD_PKGS} # docker commands (need as we use docker daemon from "outside") RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository "deb [arch="$(dpkg --print-architecture)"] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" \ && apt-get update -q \ && apt-get install -y -q \ - docker-ce-cli \ - docker-buildx-plugin \ - docker-compose-plugin + docker-ce-cli \ + docker-buildx-plugin \ + docker-compose-plugin # Install go ENV GOROOT=/usr/local/go