Skip to content

Commit 6ffa475

Browse files
author
paigehargrave
authored
Merge branch 'master' into patch-1
2 parents 654d4c5 + 206edc4 commit 6ffa475

File tree

644 files changed

+1750
-25753
lines changed

Some content is hidden

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

644 files changed

+1750
-25753
lines changed

‎.nojekyll

Whitespace-only changes.

‎404.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta http-equiv="refresh" content="1; url=https://docs.docker.com" />
6+
<title>Docker Documentation</title>
7+
</head>
8+
<body>
9+
<p>We have moved away from the <strong>docker.github.io</strong> domain. If you're not automatically redirected, please visit us at <a href="https://docs.docker.com">docs.docker.com</a>.</p>
10+
11+
<script>
12+
window.location.assign("https://docs.docker.com" + window.location.pathname);
13+
</script>
14+
</body>
15+
</html>

‎_config.yml

+15-17
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ lsi: false
1414
url: https://docs.docker.com
1515
# This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile)
1616
keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12", "v18.03"]
17-
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"]
17+
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"]
1818

19-
# Component versions -- address like site.docker_ce_stable_version
19+
# Component versions -- address like site.docker_ce_version
2020
# You can't have - characters in these for non-YAML reasons
2121

22-
latest_stable_docker_engine_api_version: "1.39"
23-
docker_ce_stable_version: "18.09"
24-
docker_ce_edge_version: "18.09"
22+
latest_engine_api_version: "1.39"
23+
docker_ce_version: "18.09"
2524
docker_ee_version: "18.09"
2625
compose_version: "1.23.2"
2726
machine_version: "0.16.0"
@@ -95,7 +94,7 @@ defaults:
9594
- scope:
9695
path: "install"
9796
values:
98-
win_latest_build: "docker-18.09.0"
97+
win_latest_build: "docker-18.09.1"
9998
- scope:
10099
path: "datacenter"
101100
values:
@@ -105,34 +104,34 @@ defaults:
105104
values:
106105
dtr_org: "docker"
107106
dtr_repo: "dtr"
108-
dtr_version: "2.6.0"
107+
dtr_version: "2.6.1"
109108
- scope:
110109
path: "datacenter/dtr/2.5"
111110
values:
112111
hide_from_sitemap: true
113112
dtr_org: "docker"
114113
dtr_repo: "dtr"
115-
dtr_version: "2.5.6"
114+
dtr_version: "2.5.7"
116115
- scope:
117116
path: "datacenter/dtr/2.4"
118117
values:
119118
hide_from_sitemap: true
120119
dtr_org: "docker"
121120
dtr_repo: "dtr"
122-
dtr_version: "2.4.7"
121+
dtr_version: "2.4.8"
123122
- scope:
124123
path: "datacenter/dtr/2.3"
125124
values:
126125
hide_from_sitemap: true
127126
dtr_org: "docker"
128127
dtr_repo: "dtr"
129-
dtr_version: "2.3.9"
128+
dtr_version: "2.3.10"
130129
- scope:
131130
path: "datacenter/dtr/2.2"
132131
values:
133132
ucp_version: "2.1"
134133
dtr_version: "2.2"
135-
docker_image: "docker/dtr:2.2.12"
134+
docker_image: "docker/dtr:2.2.11"
136135
- scope:
137136
path: "datacenter/dtr/2.1"
138137
values:
@@ -148,30 +147,29 @@ defaults:
148147
values:
149148
ucp_org: "docker"
150149
ucp_repo: "ucp"
151-
ucp_version: "3.1.1"
150+
ucp_version: "3.1.2"
152151
- scope: # This is a bit of a hack for the get-support.md topic.
153152
path: "ee"
154153
values:
155154
ucp_org: "docker"
156155
ucp_repo: "ucp"
157156
dtr_repo: "dtr"
158-
ucp_version: "3.1.1"
159-
dtr_version: "2.6.0"
160-
dtr_latest_image: "docker/dtr:2.6.0"
157+
ucp_version: "3.1.2"
158+
dtr_version: "2.6.1"
161159
- scope:
162160
path: "datacenter/ucp/3.0"
163161
values:
164162
hide_from_sitemap: true
165163
ucp_org: "docker"
166164
ucp_repo: "ucp"
167-
ucp_version: "3.0.7"
165+
ucp_version: "3.0.8"
168166
- scope:
169167
path: "datacenter/ucp/2.2"
170168
values:
171169
hide_from_sitemap: true
172170
ucp_org: "docker"
173171
ucp_repo: "ucp"
174-
ucp_version: "2.2.14"
172+
ucp_version: "2.2.15"
175173
- scope:
176174
path: "datacenter/ucp/2.1"
177175
values:

‎_config_authoring.yml

+63-28
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,38 @@ name: Docker Documentation
22
markdown: kramdown
33
kramdown:
44
input: GFM
5+
gfm_quirks: [paragraph_end, no_auto_typographic]
56
html_to_native: true
67
hard_wrap: false
78
syntax_highlighter: rouge
89
toc_levels: 2..3
10+
incremental: false
911
permalink: pretty
1012
safe: false
1113
lsi: false
1214
url: https://docs.docker.com
13-
incremental: false
1415

15-
# Component versions -- address like site.docker_ce_stable_version
16+
# Component versions -- address like site.docker_ce_version
1617
# You can't have - characters in these for non-YAML reasons
1718

1819
# TO USE ME:
1920
# jekyll serve --incremental --config _config_authoring.yml
2021

21-
docker_ce_stable_version: "17.09"
22-
latest_stable_docker_engine_api_version: "1.32"
23-
docker_ce_edge_version: "17.09"
24-
docker_ee_version: "17.06"
25-
compose_version: "1.16.1"
26-
machine_version: "0.12.2"
22+
latest_engine_api_version: "1.39"
23+
docker_ce_version: "18.09"
24+
docker_ee_version: "18.09"
25+
compose_version: "1.23.2"
26+
machine_version: "0.16.0"
2727
distribution_version: "2.6"
28-
dtr_version: "2.5"
29-
ucp_version: "3.0"
28+
dtr_version: "2.6"
29+
ucp_version: "3.1"
3030

3131
ucp_versions:
32-
- version: "3.0"
32+
- version: "3.1"
3333
path: /ee/ucp/
3434
latest: true
35+
- version: "3.0"
36+
path: /datacenter/ucp/3.0/guides/
3537
- version: "2.2"
3638
path: /datacenter/ucp/2.2/guides/
3739
- version: "2.1"
@@ -42,9 +44,11 @@ ucp_versions:
4244
path: /datacenter/ucp/1.1/overview/
4345

4446
dtr_versions:
45-
- version: "2.5"
47+
- version: "2.6"
4648
path: /ee/dtr/
4749
latest: true
50+
- version: "2.5"
51+
path: /datacenter/dtr/2.5/guides/
4852
- version: "2.4"
4953
path: /datacenter/dtr/2.4/guides/
5054
- version: "2.3"
@@ -57,7 +61,7 @@ dtr_versions:
5761
path: /datacenter/dtr/2.0/
5862

5963
tablabels:
60-
dee-2.0: Docker Enterprise Edition 2.0 Beta2
64+
dee-2.0: Docker Enterprise Edition 2.0
6165
ucp-3.0: Universal Control Plane 3.0
6266
ucp-2.2: Universal Control Plane 2.2
6367
dtr-2.5: Docker Trusted Registry 2.5
@@ -69,52 +73,65 @@ tablabels:
6973
kubectl: Kubernetes CLI
7074
cli: CLI
7175

76+
collections:
77+
samples:
78+
output: true
79+
80+
plugins:
81+
- jekyll-redirect-from
82+
- jekyll-relative-links
83+
- jekyll-sitemap
84+
7285
defaults:
73-
-
74-
scope:
86+
- scope:
7587
path: ""
7688
type: "pages"
7789
values:
7890
layout: docs
79-
defaultassignee: johndmulhausen
8091
toc_min: 2
8192
toc_max: 3
8293
tree: true
8394
- scope:
84-
path: "engine"
95+
path: "install"
8596
values:
86-
win_latest_build: "docker-17.06.2-ee-6"
97+
win_latest_build: "docker-18.09.1"
8798
- scope:
8899
path: "datacenter"
89100
values:
90-
ucp_latest_image: "docker/ucp:3.0.0-beta2"
91-
dtr_latest_image: "docker/dtr:2.5.0-beta3"
92101
enterprise: true
93102
- scope:
94103
path: "ee/dtr"
95104
values:
96105
dtr_org: "docker"
97106
dtr_repo: "dtr"
98-
dtr_version: "2.5.0-beta3"
107+
dtr_version: "2.6.1"
108+
- scope:
109+
path: "datacenter/dtr/2.5"
110+
values:
111+
hide_from_sitemap: true
112+
dtr_org: "docker"
113+
dtr_repo: "dtr"
114+
dtr_version: "2.5.7"
99115
- scope:
100116
path: "datacenter/dtr/2.4"
101117
values:
102118
hide_from_sitemap: true
103119
dtr_org: "docker"
104120
dtr_repo: "dtr"
105-
dtr_version: "2.4.1"
121+
dtr_version: "2.4.8"
106122
- scope:
107123
path: "datacenter/dtr/2.3"
108124
values:
125+
hide_from_sitemap: true
109126
dtr_org: "docker"
110127
dtr_repo: "dtr"
111-
dtr_version: "2.3.4"
128+
dtr_version: "2.3.10"
112129
- scope:
113130
path: "datacenter/dtr/2.2"
114131
values:
115132
ucp_version: "2.1"
116133
dtr_version: "2.2"
117-
docker_image: "docker/dtr:2.2.9"
134+
docker_image: "docker/dtr:2.2.11"
118135
- scope:
119136
path: "datacenter/dtr/2.1"
120137
values:
@@ -130,29 +147,47 @@ defaults:
130147
values:
131148
ucp_org: "docker"
132149
ucp_repo: "ucp"
133-
ucp_version: "3.0.0-beta2"
150+
ucp_version: "3.1.2"
151+
- scope: # This is a bit of a hack for the get-support.md topic.
152+
path: "ee"
153+
values:
154+
ucp_org: "docker"
155+
ucp_repo: "ucp"
156+
dtr_repo: "dtr"
157+
ucp_version: "3.1.2"
158+
dtr_version: "2.6.1"
159+
- scope:
160+
path: "datacenter/ucp/3.0"
161+
values:
162+
hide_from_sitemap: true
163+
ucp_org: "docker"
164+
ucp_repo: "ucp"
165+
ucp_version: "3.0.8"
134166
- scope:
135167
path: "datacenter/ucp/2.2"
136168
values:
137169
hide_from_sitemap: true
138170
ucp_org: "docker"
139171
ucp_repo: "ucp"
140-
ucp_version: "2.2.3"
172+
ucp_version: "2.2.15"
141173
- scope:
142174
path: "datacenter/ucp/2.1"
143175
values:
176+
hide_from_sitemap: true
144177
ucp_version: "2.1"
145178
dtr_version: "2.2"
146-
docker_image: "docker/ucp:2.1.5"
179+
docker_image: "docker/ucp:2.1.8"
147180
- scope:
148181
path: "datacenter/ucp/2.0"
149182
values:
183+
hide_from_sitemap: true
150184
ucp_version: "2.0"
151185
dtr_version: "2.1"
152-
docker_image: "docker/ucp:2.0.3"
186+
docker_image: "docker/ucp:2.0.4"
153187
- scope:
154188
path: "datacenter/ucp/1.1"
155189
values:
190+
hide_from_sitemap: true
156191
ucp_version: "1.1"
157192
dtr_version: "2.0"
158193

‎_data/advisories.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
texts:
1111
experimental: "The functionality described on this page is marked as Experimental, and as such, may change before it becomes generally available."
1212
rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available."
13-
docker4mac-beta: "Docker for Mac is currently in public beta. Some functionality may change before the product becomes generally available."
14-
docker4win-beta: "Docker for Windows is currently in public beta. Some functionality may change before the product becomes generally available."
15-
toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible."
16-
kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications."
13+
docker4mac-beta: "Docker Desktop for Mac is currently in public beta. Some functionality may change before the product becomes generally available."
14+
docker4win-beta: "Docker Desktop for Windows is currently in public beta. Some functionality may change before the product becomes generally available."
15+
toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker Desktop for Mac](/docker-for-mac/) and [Docker Desktop for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible."
16+
kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker Desktop for Mac](/docker-for-mac/) or [Docker Desktop for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications."
1717
swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product."
1818
swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode &#8212; a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the [Get started with Docker walkthrough](/get-started/)). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands."
19-
engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta."
19+
engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker Desktop for Mac and Docker Desktop for Windows are currently in Beta."
2020

2121

2222
# URL based advisories

0 commit comments

Comments
 (0)