Merge pull request #3185 from thaJeztah/update_dev_dockerfile

Update contrib/Dockerfile.test
This commit is contained in:
Michael Crosby 2019-04-05 08:39:46 -04:00 committed by GitHub
commit 591e52c504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,26 +6,48 @@
# 3.) $ make binaries install test # 3.) $ make binaries install test
# #
ARG GOLANG_VERSION=1.12
FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
WORKDIR /go/src/github.com/containerd/containerd
# Install proto3 # Install proto3
FROM golang:1.11 AS proto3 FROM golang-base 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 \
--no-install-recommends
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.11 AS runc FROM golang-base AS runc
RUN apt-get update && apt-get install -y curl libseccomp-dev RUN apt-get update && apt-get install -y \
COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf curl \
libseccomp-dev \
--no-install-recommends
COPY vendor.conf 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.11 FROM golang-base AS dev
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 \
--no-install-recommends
COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc
COPY --from=proto3 /usr/local/include/google /usr/local/include/google COPY --from=proto3 /usr/local/include/google /usr/local/include/google
COPY --from=runc /usr/local/sbin/runc /usr/local/go/bin/runc
COPY --from=runc /usr/local/sbin/runc /usr/local/go/bin/runc COPY . .
COPY . /go/src/github.com/containerd/containerd
WORKDIR /go/src/github.com/containerd/containerd