Update recommended versions to Go 1.10

To match build requirements for containerd now that we are using 1.10.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes
2018-02-27 16:50:12 -08:00
parent f334749967
commit 6aa612dfc2
2 changed files with 4 additions and 4 deletions

View File

@@ -7,19 +7,19 @@
#
# Install proto3
FROM golang:1.9 AS proto3
FROM golang:1.10 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.9 AS runc
FROM golang:1.10 AS runc
RUN apt-get update && apt-get install -y curl libapparmor-dev 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.9
FROM golang:1.10
RUN apt-get update && apt-get install -y btrfs-tools gcc git libapparmor-dev libseccomp-dev make xfsprogs
COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc