github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2435 from thaJeztah/bump_go_1.11

Browse Source 
Bump to Go 1.11.0
This commit is contained in:
Michael Crosby 2018-10-26 15:09:02 -04:00 committed by GitHub
commit 86b8c480c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -12,7 +12,7 @@ environment:
GOPATH: C:\gopath GOPATH: C:\gopath
CGO_ENABLED: 1 CGO_ENABLED: 1
matrix: matrix:
- GO_VERSION: 1.10 - GO_VERSION: 1.11
before_build: before_build:
- choco install -y mingw - choco install -y mingw

2
.travis.yml
View File

@ -7,7 +7,7 @@ services:
language: go language: go
go: go:
- "1.10.x" - "1.11.x"
go_import_path: github.com/containerd/containerd go_import_path: github.com/containerd/containerd

6
contrib/Dockerfile.test
View File

@ -7,19 +7,19 @@
# #
# Install proto3 # Install proto3
FROM golang:1.10 AS proto3 FROM golang:1.11 AS proto3
RUN apt-get update && apt-get install -y autoconf automake g++ libtool unzip RUN apt-get update && apt-get install -y autoconf automake g++ libtool unzip
COPY script/setup/install-protobuf install-protobuf COPY script/setup/install-protobuf install-protobuf
RUN ./install-protobuf RUN ./install-protobuf
# Install runc # Install runc
FROM golang:1.10 AS runc FROM golang:1.11 AS runc
RUN apt-get update && apt-get install -y curl libseccomp-dev RUN apt-get update && apt-get install -y curl libseccomp-dev
COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf
COPY script/setup/install-runc install-runc COPY script/setup/install-runc install-runc
RUN ./install-runc RUN ./install-runc
FROM golang:1.10 FROM golang:1.11
RUN apt-get update && apt-get install -y btrfs-tools gcc git libseccomp-dev make xfsprogs RUN apt-get update && apt-get install -y btrfs-tools gcc git libseccomp-dev make xfsprogs
COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc