Upgrade to go v1.13.1

This commit is contained in:
Rui Chen 2019-09-29 21:17:11 -04:00
parent 2ea7a717d9
commit ba787a7ec0
3 changed files with 3 additions and 4 deletions

View File

@ -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 \ 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 python3 py3-pip python3-dev openssl-dev libffi-dev libseccomp libseccomp-dev make
@ -29,4 +29,3 @@ WORKDIR ${DAPPER_SOURCE}
ENTRYPOINT ["./scripts/entry.sh"] ENTRYPOINT ["./scripts/entry.sh"]
CMD ["ci"] CMD ["ci"]

View File

@ -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 apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils
RUN go get -d github.com/heptio/sonobuoy && \ RUN go get -d github.com/heptio/sonobuoy && \

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/rancher/k3s module github.com/rancher/k3s
go 1.12 go 1.13
replace ( replace (
github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83 github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83