From ba787a7ec0b15b7a3ec96b8b95e52f8d03647e02 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 29 Sep 2019 21:17:11 -0400 Subject: [PATCH] Upgrade to go v1.13.1 --- Dockerfile.dapper | 3 +-- Dockerfile.sonobuoy.dapper | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 87c747935a..35e79d1913 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM golang:1.12.9-alpine3.10 +FROM golang:1.13.1-alpine3.10 RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \ python3 py3-pip python3-dev openssl-dev libffi-dev libseccomp libseccomp-dev make @@ -29,4 +29,3 @@ WORKDIR ${DAPPER_SOURCE} ENTRYPOINT ["./scripts/entry.sh"] CMD ["ci"] - diff --git a/Dockerfile.sonobuoy.dapper b/Dockerfile.sonobuoy.dapper index 9935627e6a..6102159925 100644 --- a/Dockerfile.sonobuoy.dapper +++ b/Dockerfile.sonobuoy.dapper @@ -1,4 +1,4 @@ -FROM golang:1.12.9-alpine3.10 +FROM golang:1.13.1-alpine3.10 RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils RUN go get -d github.com/heptio/sonobuoy && \ diff --git a/go.mod b/go.mod index e7c197b1d7..b316ce7af2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/k3s -go 1.12 +go 1.13 replace ( github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83