Skip to content

Commit

Permalink
Dockerfile.simple: simplify by using golang img
Browse files Browse the repository at this point in the history
Instead of installing golang from sources, it's easier to use
golang image which is based on Debian Stretch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
  • Loading branch information
kolyshkin committed Sep 6, 2018
1 parent bac6720 commit 32a2331
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions Dockerfile.simple
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# This represents the bare minimum required to build and test Docker.

FROM debian:stretch
FROM golang:1.10.4-stretch

# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
Expand Down Expand Up @@ -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.4
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/<name>.installer to update them.
COPY hack/dockerfile/install hack/dockerfile/install
Expand Down

0 comments on commit 32a2331

Please sign in to comment.