From ba9e1ea23cd160aad426cc64b3bbac835cdefd9d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 5 Apr 2019 11:41:51 +0200 Subject: [PATCH 1/4] contrib: Dockerfile: use build-arg for go-version Signed-off-by: Sebastiaan van Stijn --- contrib/Dockerfile.test | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 170c82df0..ea48e404f 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -6,20 +6,22 @@ # 3.) $ make binaries install test # +ARG GOLANG_VERSION=1.11 + # Install proto3 -FROM golang:1.11 AS proto3 +FROM golang:${GOLANG_VERSION} 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.11 AS runc +FROM golang:${GOLANG_VERSION} 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.11 +FROM golang:${GOLANG_VERSION} AS dev 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 From a07e12cded116d7421e2c9ad94f89676511d05c6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 5 Apr 2019 11:44:25 +0200 Subject: [PATCH 2/4] contrib: Dockerfile: reformat, and use --no-install-recommends Signed-off-by: Sebastiaan van Stijn --- contrib/Dockerfile.test | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index ea48e404f..246dc7211 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -10,24 +10,42 @@ ARG GOLANG_VERSION=1.11 # Install proto3 FROM golang:${GOLANG_VERSION} 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 RUN ./install-protobuf # Install runc FROM golang:${GOLANG_VERSION} AS runc -RUN apt-get update && apt-get install -y curl libseccomp-dev +RUN apt-get update && apt-get install -y \ + curl \ + libseccomp-dev \ + --no-install-recommends + COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf COPY script/setup/install-runc install-runc RUN ./install-runc FROM golang:${GOLANG_VERSION} 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=runc /usr/local/sbin/runc /usr/local/go/bin/runc -COPY --from=runc /usr/local/sbin/runc /usr/local/go/bin/runc COPY . /go/src/github.com/containerd/containerd WORKDIR /go/src/github.com/containerd/containerd From a84f87d84f91cb6ce0c77057c4d2bb1266eb50cd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 5 Apr 2019 12:26:55 +0200 Subject: [PATCH 3/4] contrib: Dockerfile: add a base stage Signed-off-by: Sebastiaan van Stijn --- contrib/Dockerfile.test | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index 246dc7211..b3974c2de 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -8,8 +8,12 @@ ARG GOLANG_VERSION=1.11 +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 -FROM golang:${GOLANG_VERSION} AS proto3 +FROM golang-base AS proto3 RUN apt-get update && apt-get install -y \ autoconf \ automake \ @@ -22,17 +26,17 @@ COPY script/setup/install-protobuf install-protobuf RUN ./install-protobuf # Install runc -FROM golang:${GOLANG_VERSION} AS runc +FROM golang-base AS runc RUN apt-get update && apt-get install -y \ curl \ libseccomp-dev \ --no-install-recommends -COPY vendor.conf /go/src/github.com/containerd/containerd/vendor.conf +COPY vendor.conf vendor.conf COPY script/setup/install-runc install-runc RUN ./install-runc -FROM golang:${GOLANG_VERSION} AS dev +FROM golang-base AS dev RUN apt-get update && apt-get install -y \ btrfs-tools \ gcc \ @@ -46,6 +50,4 @@ COPY --from=proto3 /usr/local/bin/protoc /usr/local/bin/protoc COPY --from=proto3 /usr/local/include/google /usr/local/include/google COPY --from=runc /usr/local/sbin/runc /usr/local/go/bin/runc -COPY . /go/src/github.com/containerd/containerd - -WORKDIR /go/src/github.com/containerd/containerd +COPY . . From 2741dbe2c120b6f5888c19a9bac0e1805d52a98a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 5 Apr 2019 12:59:20 +0200 Subject: [PATCH 4/4] contrib: Dockerfile: bump go 1.12 Signed-off-by: Sebastiaan van Stijn --- contrib/Dockerfile.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index b3974c2de..900fa1bab 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -6,7 +6,7 @@ # 3.) $ make binaries install test # -ARG GOLANG_VERSION=1.11 +ARG GOLANG_VERSION=1.12 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd