diff --git a/Dockerfile b/Dockerfile index df9af2f..535f45c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine3.11 AS build-env +FROM golang:1.14.3-alpine3.11 AS build-env COPY . maddy/ WORKDIR maddy/ diff --git a/build.sh b/build.sh index f098b87..f2b8603 100755 --- a/build.sh +++ b/build.sh @@ -199,8 +199,8 @@ read_config() { # Test whether the Go toolchain is available on the system and matches required # version. If it is not present or incompatible - download Go $GOVERSION and unpack. ensure_go() { - REQUIRED_GOVERSION=1.13.0 - GOVERSION=1.13.8 + REQUIRED_GOVERSION=1.14.0 + GOVERSION=1.14.3 pushd "$BUILDDIR" >/dev/null diff --git a/docs/tutorials/manual-installation.md b/docs/tutorials/manual-installation.md index bb52a86..0d44a90 100644 --- a/docs/tutorials/manual-installation.md +++ b/docs/tutorials/manual-installation.md @@ -2,15 +2,15 @@ ## Dependencies -- [Go](https://golang.org) toolchain (1.13 or newer) +- [Go](https://golang.org) toolchain (1.14 or newer) If your distribution ships an outdated Go version, you can use following commands to get a newer version: ``` - go get golang.org/dl/go1.13 - go1.13 download + go get golang.org/dl/go1.14 + go1.14 download ``` - Then use `go1.13` instead of `go` in commands below. + Then use `go1.14` instead of `go` in commands below. - C compiler (**optional**, set CGO_ENABLED env. variable to 0 to disable) diff --git a/go.mod b/go.mod index 3ea7023..ec5810e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/foxcpp/maddy -go 1.13 +go 1.14 require ( blitiri.com.ar/go/spf v1.1.0