p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #30755 from andrewhsu/golang-1.7.5-for-manpages

Browse Source 
use golang 1.7.5 for building man pages
Upstream-commit: 94c4c68607fcc61d28a424ee3aa33e0c233a9307
Component: engine
This commit is contained in:
Victor Vieux
2017-02-06 14:48:28 -08:00
committed by GitHub
parent 770410c730 b6e3ac9b99
commit a7aa5f4c3b
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/man/Dockerfile
View File

@ -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} && \

24
components/engine/man/Dockerfile.armhf
View File

@ -1,9 +1,27 @@
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 \
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} && \