Skip to content

Commit 0060ef4

Browse files
johndmulhausenjohndmulhausen
committed
merge conflict fixes
2 parents 9bdefe1 + 2ede6ff commit 0060ef4

163 files changed

Lines changed: 23391 additions & 42808 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,88 @@
11
FROM starefossen/github-pages
22

3+
# Basic Git set-up for throwaway commits
4+
RUN git config --global user.email "gordon@docker.com"
5+
RUN git config --global user.name "Gordon"
6+
7+
# Clone the docs repo
38
RUN git clone https://www.github.com/docker/docker.github.io allv
9+
10+
# Get docker/docker ref docs from 1.12.x branch to be used in master builds
11+
# 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
14+
# 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
16+
# Make a temporary commit for the files we added so we can check out other branches later
17+
RUN git --git-dir=./allv/.git --work-tree=./allv add engine
18+
RUN git --git-dir=./allv/.git --work-tree=./allv commit -m "Temporary commit"
19+
20+
# Create HTML for master
421
RUN jekyll build -s allv -d allvbuild
522

23+
# Check out 1.4 branch, create HTML, tweak links
624
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.4
725
RUN mkdir allvbuild/v1.4
826
RUN jekyll build -s allv -d allvbuild/v1.4
927
RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.4/#g'
1028
RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.4/#g'
1129
RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.4/#g'
1230

31+
# Check out 1.5 branch, create HTML, tweak links
1332
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.5
1433
RUN mkdir allvbuild/v1.5
1534
RUN jekyll build -s allv -d allvbuild/v1.5
1635
RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.5/#g'
1736
RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.5/#g'
1837
RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.5/#g'
1938

39+
# Check out 1.6, create HTML, tweak links
2040
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.6
2141
RUN mkdir allvbuild/v1.6
2242
RUN jekyll build -s allv -d allvbuild/v1.6
2343
RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.6/#g'
2444
RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.6/#g'
2545
RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.6/#g'
2646

47+
# Check out 1.7, create HTML, tweak links
2748
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.7
2849
RUN mkdir allvbuild/v1.7
2950
RUN jekyll build -s allv -d allvbuild/v1.7
3051
RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.7/#g'
3152
RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.7/#g'
3253
RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.7/#g'
3354

55+
# Check out 1.8, create HTML, tweak links
3456
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.8
3557
RUN mkdir allvbuild/v1.8
3658
RUN jekyll build -s allv -d allvbuild/v1.8
3759
RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.8/#g'
3860
RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.8/#g'
3961
RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.8/#g'
4062

63+
# Check out 1.9, create HTML, tweak links
4164
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.9
4265
RUN mkdir allvbuild/v1.9
4366
RUN jekyll build -s allv -d allvbuild/v1.9
4467
RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.9/#g'
4568
RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.9/#g'
4669
RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.9/#g'
4770

71+
# Check out 1.10, create HTML, tweak links
4872
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.10
4973
RUN mkdir allvbuild/v1.10
5074
RUN jekyll build -s allv -d allvbuild/v1.10
5175
RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.10/#g'
5276
RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.10/#g'
5377
RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.10/#g'
5478

79+
# Check out 1.11, create HTML, tweak links
5580
RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.11
5681
RUN mkdir allvbuild/v1.11
5782
RUN jekyll build -s allv -d allvbuild/v1.11
5883
RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.11/#g'
5984
RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.11/#g'
6085
RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.11/#g'
6186

87+
# Serve the site, which is now all static HTML
6288
CMD jekyll serve -s /usr/src/app/allvbuild -d /_site --no-watch -H 0.0.0.0 -P 4000

‎_data/toc.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
toc:
22
- title: Welcome to the Docs
33
path: /
4+
- sectiontitle: Docker ID
5+
section:
6+
- path: /docker-id/
7+
title: Docker ID accounts
48
- sectiontitle: Docker Engine
59
section:
610
- sectiontitle: Install
@@ -205,6 +209,8 @@ toc:
205209
title: Apply rolling updates
206210
- path: /engine/swarm/swarm-tutorial/drain-node/
207211
title: Drain a node
212+
- path: /engine/swarm/ingress/
213+
title: Use swarm mode routing mesh
208214
- sectiontitle: How swarm mode works
209215
section:
210216
- path: /engine/swarm/how-swarm-mode-works/nodes/
@@ -769,6 +775,8 @@ toc:
769775
title: Use your own certificates
770776
- path: /datacenter/dtr/2.1/guides/configure/configure-storage/
771777
title: Storage configuration
778+
- path: /datacenter/dtr/2.1/guides/configure/use-nfs/
779+
title: Use NFS
772780
- sectiontitle: Monitor and troubleshoot
773781
section:
774782
- path: /datacenter/dtr/2.1/guides/monitor-troubleshoot/

‎_layouts/docs.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@
210210
{% if page.noratings != true %}
211211
<div style="text-align: center; margin-top: 50px">
212212
<img src="/images/chat.png" alt="chat icon" style="margin-right: 10px">
213-
<b>Feedback?</b> Questions? Suggestions?<br/>
214-
<a href="{{ editsource }}" class="nomunge">Edit this page</a>,
215-
<a href="https://github.com/docker/docker.github.io/issues/new?title=Feedback for: {{ page.path }}&assignee={% if page.assignee %}{{ page.assignee }}{% else %}{{ page.defaultassignee }}{% endif %}&body=File: [{{ page.path }}](https://docs.docker.com{{ page.url }})" class="nomunge">file a ticket</a>, or rate this page:
213+
<b>Feedback?</b> Suggestions? Can't find something in the docs?<br/>
214+
<a href="https://github.com/docker/docker.github.io/edit/master/{{ page.path }}" class="nomunge">Edit this page</a> <span style="color:#D8E0E0">&#9679;</span>
215+
<a href="https://github.com/docker/docker.github.io/issues/new?title=Feedback for: {{ page.path }}&assignee={% if page.assignee %}{{ page.assignee }}{% else %}{{ page.defaultassignee }}{% endif %}&body=File: [{{ page.path }}](https://docs.docker.com{{ page.url }})" class="nomunge">Request docs changes</a> <span style="color:#D8E0E0">&#9679;</span> <a href="https://www.docker.com/docker-support-services">Get support</a> <br />Rate this page:
216216
<div id="pd_rating_holder_8453675"></div>
217217
<script type="text/javascript">
218218
PDRTJS_settings_8453675 = {

‎apidocs/cloud-api-source/source/includes/container.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,6 @@ bridge | Creates a new network stack for the container on the docker bridge.
364364
host | Uses the host network stack inside the container.
365365

366366

367-
### Container Last Metric attributes
368-
369-
Attribute | Description
370-
--------- | -----------
371-
cpu | CPU percentage usage
372-
memory | Memory usage in bytes
373-
disk | Disk storage usage in bytes
374-
375-
376367
### Container Link attributes
377368

378369
Attribute | Description

‎apidocs/cloud-api-source/source/includes/node.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ Upgrading | The node docker daemon is being upgraded. No actions allowed in this
7777
Terminating | The node is being terminated in the cloud provider. No actions allowed in this state.
7878
Terminated | The node has been terminated and is no longer present in the cloud provider. No actions allowed in this state.
7979

80-
### Node Last Metric attributes
81-
82-
Attribute | Description
83-
--------- | -----------
84-
cpu | CPU percentage usage
85-
memory | Memory usage in bytes
86-
disk | Disk storage usage in bytes
87-
8880

8981
## List all nodes
9082

‎apidocs/docker-cloud/includes/container.html‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -630,28 +630,6 @@ <h3 id="network-modes">Network Modes</h3>
630630
</tr>
631631
</tbody></table>
632632

633-
<h3 id="container-last-metric-attributes">Container Last Metric attributes</h3>
634-
635-
<table><thead>
636-
<tr>
637-
<th>Attribute</th>
638-
<th>Description</th>
639-
</tr>
640-
</thead><tbody>
641-
<tr>
642-
<td>cpu</td>
643-
<td>CPU percentage usage</td>
644-
</tr>
645-
<tr>
646-
<td>memory</td>
647-
<td>Memory usage in bytes</td>
648-
</tr>
649-
<tr>
650-
<td>disk</td>
651-
<td>Disk storage usage in bytes</td>
652-
</tr>
653-
</tbody></table>
654-
655633
<h3 id="container-link-attributes">Container Link attributes</h3>
656634

657635
<table><thead>

‎apidocs/docker-cloud/includes/node.html‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -200,28 +200,6 @@ <h3 id="node-states">Node states</h3>
200200
</tr>
201201
</tbody></table>
202202

203-
<h3 id="node-last-metric-attributes">Node Last Metric attributes</h3>
204-
205-
<table><thead>
206-
<tr>
207-
<th>Attribute</th>
208-
<th>Description</th>
209-
</tr>
210-
</thead><tbody>
211-
<tr>
212-
<td>cpu</td>
213-
<td>CPU percentage usage</td>
214-
</tr>
215-
<tr>
216-
<td>memory</td>
217-
<td>Memory usage in bytes</td>
218-
</tr>
219-
<tr>
220-
<td>disk</td>
221-
<td>Disk storage usage in bytes</td>
222-
</tr>
223-
</tbody></table>
224-
225203
<h2 id="list-all-nodes">List all nodes</h2>
226204
<pre class="highlight python"><code><span class="kn">import</span> <span class="nn">dockercloud</span>
227205

‎apidocs/docker-cloud/index.html‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,28 +1983,6 @@ <h3 id="node-states">Node states</h3>
19831983
</tr>
19841984
</tbody></table>
19851985

1986-
<h3 id="node-last-metric-attributes">Node Last Metric attributes</h3>
1987-
1988-
<table><thead>
1989-
<tr>
1990-
<th>Attribute</th>
1991-
<th>Description</th>
1992-
</tr>
1993-
</thead><tbody>
1994-
<tr>
1995-
<td>cpu</td>
1996-
<td>CPU percentage usage</td>
1997-
</tr>
1998-
<tr>
1999-
<td>memory</td>
2000-
<td>Memory usage in bytes</td>
2001-
</tr>
2002-
<tr>
2003-
<td>disk</td>
2004-
<td>Disk storage usage in bytes</td>
2005-
</tr>
2006-
</tbody></table>
2007-
20081986
<h2 id="list-all-nodes">List all nodes</h2>
20091987
<pre class="highlight python"><code><span class="kn">import</span> <span class="nn">dockercloud</span>
20101988

@@ -5438,28 +5416,6 @@ <h3 id="network-modes">Network Modes</h3>
54385416
</tr>
54395417
</tbody></table>
54405418

5441-
<h3 id="container-last-metric-attributes">Container Last Metric attributes</h3>
5442-
5443-
<table><thead>
5444-
<tr>
5445-
<th>Attribute</th>
5446-
<th>Description</th>
5447-
</tr>
5448-
</thead><tbody>
5449-
<tr>
5450-
<td>cpu</td>
5451-
<td>CPU percentage usage</td>
5452-
</tr>
5453-
<tr>
5454-
<td>memory</td>
5455-
<td>Memory usage in bytes</td>
5456-
</tr>
5457-
<tr>
5458-
<td>disk</td>
5459-
<td>Disk storage usage in bytes</td>
5460-
</tr>
5461-
</tbody></table>
5462-
54635419
<h3 id="container-link-attributes">Container Link attributes</h3>
54645420

54655421
<table><thead>

‎apidocs/layouts/single.html‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,28 +1983,6 @@ <h3 id="node-states">Node states</h3>
19831983
</tr>
19841984
</tbody></table>
19851985

1986-
<h3 id="node-last-metric-attributes">Node Last Metric attributes</h3>
1987-
1988-
<table><thead>
1989-
<tr>
1990-
<th>Attribute</th>
1991-
<th>Description</th>
1992-
</tr>
1993-
</thead><tbody>
1994-
<tr>
1995-
<td>cpu</td>
1996-
<td>CPU percentage usage</td>
1997-
</tr>
1998-
<tr>
1999-
<td>memory</td>
2000-
<td>Memory usage in bytes</td>
2001-
</tr>
2002-
<tr>
2003-
<td>disk</td>
2004-
<td>Disk storage usage in bytes</td>
2005-
</tr>
2006-
</tbody></table>
2007-
20081986
<h2 id="list-all-nodes">List all nodes</h2>
20091987
<pre class="highlight python"><code><span class="kn">import</span> <span class="nn">dockercloud</span>
20101988

@@ -5438,28 +5416,6 @@ <h3 id="network-modes">Network Modes</h3>
54385416
</tr>
54395417
</tbody></table>
54405418

5441-
<h3 id="container-last-metric-attributes">Container Last Metric attributes</h3>
5442-
5443-
<table><thead>
5444-
<tr>
5445-
<th>Attribute</th>
5446-
<th>Description</th>
5447-
</tr>
5448-
</thead><tbody>
5449-
<tr>
5450-
<td>cpu</td>
5451-
<td>CPU percentage usage</td>
5452-
</tr>
5453-
<tr>
5454-
<td>memory</td>
5455-
<td>Memory usage in bytes</td>
5456-
</tr>
5457-
<tr>
5458-
<td>disk</td>
5459-
<td>Disk storage usage in bytes</td>
5460-
</tr>
5461-
</tbody></table>
5462-
54635419
<h3 id="container-link-attributes">Container Link attributes</h3>
54645420

54655421
<table><thead>

‎compose/compose-file.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ The Compose file is a [YAML](http://yaml.org/) file defining
1212
[volumes](compose-file.md#volume-configuration-reference).
1313
The default path for a Compose file is `./docker-compose.yml`.
1414

15+
>**Tip:** You can use either a `.yml` or `.yaml` extension for this file. They both work.
16+
1517
A service definition contains configuration which will be applied to each
1618
container started for that service, much like passing command-line parameters to
1719
`docker run`. Likewise, network and volume definitions are analogous to
@@ -1309,4 +1311,4 @@ If you forget and use a single dollar sign (`$`), Compose interprets the value a
13091311
- [Get started with Django](django.md)
13101312
- [Get started with Rails](rails.md)
13111313
- [Get started with WordPress](wordpress.md)
1312-
- [Command line reference](./reference/index.md)
1314+
- [Command line reference](./reference/index.md)

0 commit comments

Comments
 (0)