Bump to Go 1.11.x
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
c4446665cb
commit
07237e34e6
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user