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.

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

Release Engine 1.13 documentation #1187

Merged
merged 60 commits into from
Jan 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e3a3145
Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e092…
Oct 10, 2016
2169ef3
swarm: Document rollback, failure threshold, and monitor flags
aaronlehmann Oct 15, 2016
c15d1f5
Remove Fedora 22 as it's EOL
thaJeztah Oct 17, 2016
4e22417
update apparmor documentation to reflect changes in 1.13.0
tophj-ibm Oct 11, 2016
0e10a66
Added details about tag support for AWS log driver
Oct 29, 2016
4567784
Changed wording for tag description
Oct 31, 2016
06cfd9e
Updated docs to show full container ID
Oct 31, 2016
04c11a3
Updated wording on log stream default
Oct 31, 2016
2bc543c
Added raw tags
Nov 1, 2016
10590cf
Update note about custom certs with system certs
dmcgowan Nov 1, 2016
8f8b4a2
Remove Ubuntu 15.10 Wily Werewolf
thaJeztah Nov 9, 2016
45a19ec
Add Ubuntu 16.10 Yakkety Yak
thaJeztah Nov 9, 2016
eb93d33
add unix-sockets support in Fluentd logging driver
akirakoyasu Nov 12, 2016
d2826a8
Add engine changes that were lost in syncing
thaJeztah Nov 15, 2016
4b631d8
Create logentries.md (#244)
caarlos0 Nov 16, 2016
9e20d71
Add NATS client as option for publishing container logs (#369)
Nov 22, 2016
1b80389
Document ability to update a service's image
Nov 11, 2016
31a3924
First version of stack deployment tutorial
aanand Nov 22, 2016
4043237
Document new CPU scheduling flags
Dec 12, 2016
d612188
Initial dump of CLI in yaml (#737)
FrenchBen Nov 29, 2016
a0362f6
Merge pull request #586 from mstanleyjones/583_realtime_cpu_support
Dec 12, 2016
4197fd8
Update dockerfile vnext (#874)
Dec 13, 2016
3344f16
Move accounts API docs to Docker ID section
bfirsh Nov 21, 2016
2f3218c
Rename Remote API to Engine API
bfirsh Nov 16, 2016
f8dac1b
Add automatically generated Engine API docs
bfirsh Nov 25, 2016
e9efceb
Merge pull request #606 from bfirsh/swagger-api-docs
Dec 14, 2016
1d5c338
Upgrade to ReDoc 1.6.2 (#891)
bfirsh Dec 16, 2016
c3ec389
Add full documentation for APIs and SDKs
bfirsh Dec 1, 2016
c525c9b
Merge pull request #210 from bfirsh/api-and-sdks-documentation
Dec 19, 2016
5ed83f4
Updated Yaml files (#922)
FrenchBen Dec 19, 2016
132f33d
Added latest docs from Editions AWS & Azure (#887)
FrenchBen Dec 19, 2016
50de447
Restructure navigation for Editions
johndmulhausen Dec 20, 2016
46e044e
Fixing double curly braces
Dec 20, 2016
5591272
Merge pull request #942 from mstanleyjones/fix_curly_braces
Dec 20, 2016
3589870
YAML-sourced CLI refdocs
johndmulhausen Dec 21, 2016
84c02e1
Add 'docker' label to commands
johndmulhausen Dec 21, 2016
5b28429
Fix for blank node
johndmulhausen Dec 21, 2016
f4a28b3
Document Docker secrets
Nov 15, 2016
9d50621
Update syntax of the -f flag in the examples
Jan 4, 2017
5e14565
Merge pull request #568 from mstanleyjones/529_secrets
thaJeztah Jan 9, 2017
3d72d43
Update the syntax of 'docker secret create' in the examples
Jan 9, 2017
b821901
Merge pull request #1070 from mstanleyjones/update_secrets_syntax
Jan 9, 2017
b0b4463
Document the ability to publish a port locally on a swarm node
Jan 11, 2017
6415ff6
Add info about image resolution with content trust
Jan 9, 2017
0f68d0a
Merge pull request #1091 from mstanleyjones/643_service_publish_port_…
Jan 12, 2017
32d07fe
Merge pull request #1065 from mstanleyjones/service_create_with_conte…
Jan 12, 2017
a7cb8d9
remove confusing sentence from "publishing" section
thaJeztah Jan 13, 2017
9374c5f
Add examples to CLI generation templates
Jan 9, 2017
0c784a4
Merge pull request #1123 from thaJeztah/update-publishing-doc
Jan 13, 2017
d2bd145
Merge pull request #1069 from mstanleyjones/examples_to_cli_temporary…
Jan 13, 2017
50e75ff
Rewrite and reorganize Linux install instructions
Jan 5, 2017
7734148
Fix typo in Oracle install instructions
Jan 19, 2017
80a614c
Merge pull request #1159 from mstanleyjones/install_linux
Jan 19, 2017
39eac8e
Merge pull request #1170 from mstanleyjones/fix_oracle_typo
Jan 19, 2017
2da8713
Updated docs to remove beta and stable link (#1160)
FrenchBen Jan 19, 2017
988d920
Addressing feedback from new installation instructions (#1172)
Jan 19, 2017
ca4f132
Added latest docs from Editions AWS & Azure (#887)
FrenchBen Dec 19, 2016
41587fa
Restructure navigation for Editions
johndmulhausen Dec 20, 2016
584acf3
Fix a couple of Liquid errors
Jan 19, 2017
00d68e5
Merge pull request #1188 from docker/linkfix-john
Jan 19, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ RUN git clone https://www.github.com/docker/docker.github.io temp; \
COPY . allv

## Branch to pull from, per ref doc
ENV ENGINE_BRANCH="1.12.x"
ENV ENGINE_BRANCH="1.13.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 \
RUN 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 \
&& rm -rf allv/apidocs/cloud-api-source \
&& rm -rf allv/tests \
&& wget -O allv/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/api/swagger.yaml \
&& jekyll build -s allv -d allvbuild \
&& find allvbuild/engine/reference -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \
&& find allvbuild/engine/extend -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \
Expand Down
Loading