From 8dc75c5438befcf01b5e96885ae2a29d8b51ac6d Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Sun, 5 Feb 2017 22:40:57 -0800 Subject: [PATCH 1/3] from golang:1.7.5-alpine for docker-manpage-dev Signed-off-by: Andrew Hsu Upstream-commit: 7b52ec5f103bc026b47e58f2c4dfe46b9bd83c32 Component: engine --- components/engine/man/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/man/Dockerfile b/components/engine/man/Dockerfile index 3ed219304c..80e97ff01e 100644 --- a/components/engine/man/Dockerfile +++ b/components/engine/man/Dockerfile @@ -1,9 +1,8 @@ -FROM alpine:3.4 +FROM golang:1.7.5-alpine -RUN apk add -U git go bash curl gcc musl-dev make +RUN apk add -U git bash curl gcc musl-dev make RUN mkdir -p /go/src /go/bin /go/pkg -ENV GOPATH=/go RUN export GLIDE=v0.11.1; \ export TARGET=/go/src/github.com/Masterminds; \ mkdir -p ${TARGET} && \ From daca41d5ee7f30e44497b2165e9dfd3ad496067a Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 6 Feb 2017 11:29:25 -0800 Subject: [PATCH 2/3] use precompiled go from google, needs debian to work Signed-off-by: Andrew Hsu Upstream-commit: a6886bfc5253453b79cdddd7f8412b29356fd02b Component: engine --- components/engine/man/Dockerfile.armhf | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/components/engine/man/Dockerfile.armhf b/components/engine/man/Dockerfile.armhf index 6fbd178c51..85ea591fe0 100644 --- a/components/engine/man/Dockerfile.armhf +++ b/components/engine/man/Dockerfile.armhf @@ -1,9 +1,28 @@ -FROM armhf/alpine:3.4 +FROM armhf/debian:jessie -RUN apk add -U git go bash curl gcc musl-dev make +# allow replacing httpredir or deb mirror +ARG APT_MIRROR=deb.debian.org +RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list + +RUN apt-get update && apt-get install -y \ + git \ + bash \ + curl \ + gcc \ + musl-dev \ + make + +ENV GO_VERSION 1.7.5 +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" \ + | tar -xzC /usr/local +ENV PATH /go/bin:/usr/local/go/bin:$PATH +ENV GOPATH /go + +# We're building for armhf, which is ARMv7, so let's be explicit about that +ENV GOARCH arm +ENV GOARM 7 RUN mkdir -p /go/src /go/bin /go/pkg -ENV GOPATH=/go RUN export GLIDE=v0.11.1; \ export TARGET=/go/src/github.com/Masterminds; \ mkdir -p ${TARGET} && \ From b6e3ac9b99bb678b3133b6d4a0117f60000cc95f Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 6 Feb 2017 13:32:21 -0800 Subject: [PATCH 3/3] remove musl-dev in man/Dockerfile.armhf Signed-off-by: Andrew Hsu Upstream-commit: 1c7a66eda768dcdcc210c7c43d80770bfb59b435 Component: engine --- components/engine/man/Dockerfile.armhf | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/man/Dockerfile.armhf b/components/engine/man/Dockerfile.armhf index 85ea591fe0..e7ea495646 100644 --- a/components/engine/man/Dockerfile.armhf +++ b/components/engine/man/Dockerfile.armhf @@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y \ bash \ curl \ gcc \ - musl-dev \ make ENV GO_VERSION 1.7.5