From 0f2b4bb0cf875ff229760bf5d7c148b579414598 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 28 Aug 2018 12:43:35 -0700 Subject: [PATCH] Dockerfile.simple: simplify by using golang img Instead of installing golang from sources, it's easier to use golang image which is based on Debian Stretch. Signed-off-by: Kir Kolyshkin (cherry picked from commit 32a23311033dc5bfdfbc80c54a159cc92990efd2) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2e82d410bef320096e316ef7a3db8797694f88fe Component: engine --- components/engine/Dockerfile.simple | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/components/engine/Dockerfile.simple b/components/engine/Dockerfile.simple index 22c3b5ea26..a4efee8ae5 100644 --- a/components/engine/Dockerfile.simple +++ b/components/engine/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -FROM debian:stretch +FROM golang:1.10.8-stretch # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org @@ -37,18 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ vim-common \ && rm -rf /var/lib/apt/lists/* -# Install Go -# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines -# will need updating, to avoid errors. Ping #docker-maintainers on IRC -# with a heads-up. -# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored -ENV GO_VERSION 1.10.8 -RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \ - | tar -xzC /usr/local -ENV PATH /go/bin:/usr/local/go/bin:$PATH -ENV GOPATH /go -ENV CGO_LDFLAGS -L/lib - # Install runc, containerd, tini and docker-proxy # Please edit hack/dockerfile/install/.installer to update them. COPY hack/dockerfile/install hack/dockerfile/install