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

Merge pull request #2137 from tophj-ibm/bump-go-version

Browse Source 
[contrib] bump golang
This commit is contained in:
Michael Crosby 2018-02-16 10:29:34 -05:00 committed by GitHub
commit 849fed09e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/Dockerfile.test
View File

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