Skip to content

Commit 554b2c9

Browse files
author
Misty Stanley-Jones
committed
Pull distribution reference docs from upstream
1 parent f9897d3 commit 554b2c9

15 files changed

+22
-8828
lines changed

Diff for: .NOT_EDITED_HERE.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
_data/.NOT_EDITED_HERE.yaml
1+
_data/not_edited_here.yaml

Diff for: Dockerfile

+19-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,31 @@ RUN git config --global user.name "Gordon"
77
# Clone the docs repo
88
RUN git clone https://www.github.com/docker/docker.github.io allv
99

10-
# Get docker/docker ref docs from 1.12.x branch to be used in master builds
10+
## Branch to pull from, per ref doc
11+
ENV ENGINE_BRANCH="1.12.x"
12+
ENV DISTRIBUTION_BRANCH="release/2.5"
13+
14+
# Engine
15+
# Get docker/docker ref docs from $ENGINE_BRANCH branch to be used in master builds
1116
# Uses Github Subversion gateway to limit the checkout
12-
RUN svn co https://github.com/docker/docker/branches/1.12.x/docs/reference allv/engine/reference
13-
RUN svn co https://github.com/docker/docker/branches/1.12.x/docs/extend allv/engine/extend
17+
RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/reference allv/engine/reference
18+
RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/extend allv/engine/extend
1419
# Can't use the svn trick to get a single file, use wget instead
15-
RUN wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/1.12.x/docs/deprecated.md
20+
RUN wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/deprecated.md
1621
# Make a temporary commit for the files we added so we can check out other branches later
1722
RUN git --git-dir=./allv/.git --work-tree=./allv add engine
1823
RUN git --git-dir=./allv/.git --work-tree=./allv commit -m "Temporary commit"
1924

25+
# Distribution
26+
# Get docker/distribution ref docs from $DISTRIBUTION_BRANCH tag to be used in master builds
27+
# Uses Github Subversion gateway to limit the checkout
28+
RUN svn co https://github.com/docker/distribution/branches/$DISTRIBUTION_BRANCH/docs/spec allv/registry/spec
29+
# Can't use the svn trick to get a single file, use wget instead
30+
RUN wget -O allv/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/$DISTRIBUTION_BRANCH/docs/configuration.md
31+
# Make a temporary commit for the files we added so we can check out other branches later
32+
RUN git --git-dir=./allv/.git --work-tree=./allv add registry
33+
RUN git --git-dir=./allv/.git --work-tree=./allv commit -m "Temporary commit"
34+
2035
# Create HTML for master
2136
RUN jekyll build -s allv -d allvbuild
2237

Diff for: _data/not_edited_here.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ overrides:
3232

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

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

0 commit comments

Comments
 (0)