Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 27e2515

Browse files
Misty Stanley-Jonesjohndmulhausen
authored andcommitted
Update dockerfile vnext (docker#874)
* Merge pull request docker#731 from mstanleyjones/distribution_docs_from_upstream Pull distribution reference docs from upstream repo * Bump Engine ref docs branch to 1.13.x Signed-off-by: Misty Stanley-Jones <[email protected]>
1 parent 8c125c9 commit 27e2515

15 files changed

+15
-8829
lines changed

.NOT_EDITED_HERE.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
_data/.NOT_EDITED_HERE.yaml
1+
_data/not_edited_here.yaml

Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@ RUN git clone https://www.github.com/docker/docker.github.io temp; \
1616

1717
COPY . allv
1818

19-
# Get docker/docker ref docs from 1.12.x branch to be used in master builds
20-
# Uses Github Subversion gateway to limit the checkout
21-
RUN svn co https://github.com/docker/docker/branches/1.12.x/docs/reference allv/engine/reference \
22-
&& svn co https://github.com/docker/docker/branches/1.12.x/docs/extend allv/engine/extend \
23-
&& wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/1.12.x/docs/deprecated.md \
19+
## Branch to pull from, per ref doc
20+
ENV ENGINE_BRANCH="1.13.x"
21+
ENV DISTRIBUTION_BRANCH="release/2.5"
22+
23+
# The statements below pull reference docs from upstream locations,
24+
# then build the whole site to static HTML using Jekyll
25+
26+
RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/reference allv/engine/reference \
27+
&& svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/extend allv/engine/extend \
28+
&& wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/deprecated.md \
29+
&& svn co https://github.com/docker/distribution/branches/$DISTRIBUTION_BRANCH/docs/spec allv/registry/spec \
30+
&& wget -O allv/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/$DISTRIBUTION_BRANCH/docs/configuration.md \
2431
&& jekyll build -s allv -d allvbuild \
2532
&& rm -rf allv
2633

_data/not_edited_here.yaml

Lines changed: 2 additions & 2 deletions
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)