diff --git a/Dockerfile b/Dockerfile index a5a23a2cd5..7b91bcf98d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.12.9 as builder +FROM golang:1.13.7 as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy diff --git a/go.mod b/go.mod index 4ac919d00e..07282d0b26 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api-provider-openstack -go 1.12 +go 1.13 require ( github.com/go-logr/logr v0.1.0 diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 97ebe6055d..7286b4a16b 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -31,7 +31,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.12.1 + minimum_go_version=go1.13.0 if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then cat <