Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the man/Dockerfile for arm #25192

Merged
merged 1 commit into from
Aug 3, 2016
Merged

Fix the man/Dockerfile for arm #25192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ validate: build ## validate DCO, Seccomp profile generation, gofmt,\n./pkg/ isol
$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-default-seccomp validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet validate-vendor

manpages: ## Generate man pages from go source and markdown
docker build -t docker-manpage-dev -f man/Dockerfile .
docker build -t docker-manpage-dev -f "man/$(DOCKERFILE)" ./man
docker run \
-v $(PWD):/go/src/github.com/docker/docker/ \
docker-manpage-dev
Expand Down
24 changes: 14 additions & 10 deletions man/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 24 additions & 0 deletions man/Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]