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

Pull distribution reference docs from upstream repo #731

Merged
merged 2 commits into from
Dec 12, 2016
Merged

Pull distribution reference docs from upstream repo #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
554b2c9
Pull distribution reference docs from upstream
Nov 28, 2016
f285741
Merge remote-tracking branch 'upstream/master' into distribution_docs…
Nov 30, 2016
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 .NOT_EDITED_HERE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
_data/.NOT_EDITED_HERE.yaml
_data/not_edited_here.yaml
17 changes: 12 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,18 @@ RUN git clone https://www.github.com/docker/docker.github.io temp; \

COPY . allv

# Get docker/docker ref docs from 1.12.x branch to be used in master builds
# Uses Github Subversion gateway to limit the checkout
RUN svn co https://github.com/docker/docker/branches/1.12.x/docs/reference allv/engine/reference \
&& svn co https://github.com/docker/docker/branches/1.12.x/docs/extend allv/engine/extend \
&& wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/1.12.x/docs/deprecated.md \
## Branch to pull from, per ref doc
ENV ENGINE_BRANCH="1.12.x"
ENV DISTRIBUTION_BRANCH="release/2.5"

# The statements below pull reference docs from upstream locations,
# then build the whole site to static HTML using Jekyll

RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/reference allv/engine/reference \
&& svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/extend allv/engine/extend \
&& wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/deprecated.md \
&& svn co https://github.com/docker/distribution/branches/$DISTRIBUTION_BRANCH/docs/spec allv/registry/spec \
&& wget -O allv/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/$DISTRIBUTION_BRANCH/docs/configuration.md \
&& jekyll build -s allv -d allvbuild \
&& rm -rf allv

Expand Down
4 changes: 2 additions & 2 deletions _data/not_edited_here.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ overrides:

- path: /registry/configuration/
description: Reference docs for configuring Docker Registry
source: https://github.com/docker/distribution/tree/master/docs/configuration.md
source: https://github.com/docker/distribution/tree/release/2.5/docs/configuration.md

- path: /registry/spec/
description: Docker Registry API references
source: https://github.com/docker/distribution/tree/master/docs/spec/
source: https://github.com/docker/distribution/tree/release/2.5/docs/spec/
Loading