Skip to content

Commit

Permalink
Bump to Go 1.11.x
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Oct 25, 2018
1 parent c444666 commit 07237e3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:
GOPATH: C:\gopath
CGO_ENABLED: 1
matrix:
- GO_VERSION: 1.10
- GO_VERSION: 1.11

before_build:
- choco install -y mingw
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
language: go

go:
- "1.10.x"
- "1.11.x"

go_import_path: github.com/containerd/containerd

Expand Down
6 changes: 3 additions & 3 deletions contrib/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
#

# 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
COPY script/setup/install-protobuf install-protobuf
RUN ./install-protobuf

# 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
COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf
COPY script/setup/install-runc 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

COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc
Expand Down

0 comments on commit 07237e3

Please sign in to comment.