Fix the man/Dockerfile for arm

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-07-28 14:53:08 -04:00 committed by Tibor Vass
parent 3a778c9e1f
commit d30cedfe7c
2 changed files with 38 additions and 10 deletions

View File

@ -1,16 +1,20 @@
FROM golang:1.6.3-alpine
FROM alpine:3.4
RUN apk add -U git bash curl gcc musl-dev
RUN apk add -U git go bash curl gcc musl-dev make
RUN export GLIDE=0.10.2; \
export SRC=https://github.com/Masterminds/glide/releases/download/; \
curl -sL ${SRC}/${GLIDE}/glide-${GLIDE}-linux-amd64.tar.gz | \
tar -xz linux-amd64/glide && \
mv linux-amd64/glide /usr/bin/glide && \
chmod +x /usr/bin/glide
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} && \
git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
cd ${TARGET}/glide && \
make build && \
cp ./glide /usr/bin/glide && \
cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
COPY man/glide.yaml /manvendor/
COPY man/glide.lock /manvendor/
COPY glide.yaml /manvendor/
COPY glide.lock /manvendor/
WORKDIR /manvendor/
RUN glide install && mv vendor src
ENV GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor

24
man/Dockerfile.armhf Normal file
View File

@ -0,0 +1,24 @@
FROM armhf/alpine:3.4
RUN apk add -U git go 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} && \
git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
cd ${TARGET}/glide && \
make build && \
cp ./glide /usr/bin/glide && \
cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
COPY glide.yaml /manvendor/
COPY glide.lock /manvendor/
WORKDIR /manvendor/
RUN glide install && mv vendor src
ENV GOPATH=$GOPATH:/go/src/github.com/docker/docker/vendor:/manvendor
RUN go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
WORKDIR /go/src/github.com/docker/docker/
ENTRYPOINT ["man/generate.sh"]