diff --git a/CHANGELOG.md b/CHANGELOG.md index 863538b06..9c9d3d3a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v1.0.4 + +IMPROVEMENT +* [\#47](https://github.com/binance-chain/bsc/pull/47) upgrade to golang1.15.5 + ## v1.0.3 IMPROVEMENT diff --git a/Dockerfile b/Dockerfile index 54453c4df..f6fd62409 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ -# Build Geth in a stock Go builder container -FROM golang:1.14-alpine as builder +FROM golang:1.15-alpine as builder -RUN apk add --no-cache make gcc musl-dev linux-headers git +RUN apk add --no-cache make gcc musl-dev linux-headers git bash + +# Temporarily pull a custom Go bundle +ADD https://golang.org/dl/go1.15.5.src.tar.gz /tmp/go.tar.gz +RUN (cd /tmp && tar -xf go.tar.gz) +RUN (cd /tmp/go/src && ./make.bash) +ENV PATH="/tmp/go/bin:${PATH}" ADD . /go-ethereum RUN cd /go-ethereum && make geth @@ -13,4 +18,4 @@ RUN apk add --no-cache ca-certificates COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/ EXPOSE 8545 8546 8547 30303 30303/udp -ENTRYPOINT ["geth"] +ENTRYPOINT ["geth"] \ No newline at end of file diff --git a/go.mod b/go.mod index 98e62323b..c7bd1eb77 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ethereum/go-ethereum -go 1.13 +go 1.15 require ( github.com/Azure/azure-pipeline-go v0.2.2 // indirect diff --git a/params/version.go b/params/version.go index 519aaecad..65419f2ff 100644 --- a/params/version.go +++ b/params/version.go @@ -23,7 +23,7 @@ import ( const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 0 // Minor version component of the current release - VersionPatch = 3 // Patch version component of the current release + VersionPatch = 4 // Patch version component of the current release VersionMeta = "" // Version metadata to append to the version string )