Skip to content

Commit aaca9b8

Browse files
bermudezmtbermudezmt
committed
Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d16.
1 parent 3eaf2af commit aaca9b8

File tree

501 files changed

+14510
-3667
lines changed

Some content is hidden

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

501 files changed

+14510
-3667
lines changed

‎_config.yml

+14-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ latest_stable_docker_engine_api_version: "1.37"
2323
docker_ce_stable_version: "18.03"
2424
docker_ce_edge_version: "18.05"
2525
docker_ee_version: "17.06"
26-
compose_version: "1.21.2"
26+
compose_version: "1.22.0"
2727
machine_version: "0.14.0"
2828
distribution_version: "2.6"
2929
dtr_version: "2.5"
@@ -92,7 +92,7 @@ defaults:
9292
- scope:
9393
path: "install"
9494
values:
95-
win_latest_build: "docker-17.06.2-ee-8"
95+
win_latest_build: "docker-17.06.2-ee-16"
9696
- scope:
9797
path: "datacenter"
9898
values:
@@ -102,27 +102,27 @@ defaults:
102102
values:
103103
dtr_org: "docker"
104104
dtr_repo: "dtr"
105-
dtr_version: "2.5.0"
105+
dtr_version: "2.5.3"
106106
- scope:
107107
path: "datacenter/dtr/2.4"
108108
values:
109109
hide_from_sitemap: true
110110
dtr_org: "docker"
111111
dtr_repo: "dtr"
112-
dtr_version: "2.4.3"
112+
dtr_version: "2.4.6"
113113
- scope:
114114
path: "datacenter/dtr/2.3"
115115
values:
116116
hide_from_sitemap: true
117117
dtr_org: "docker"
118118
dtr_repo: "dtr"
119-
dtr_version: "2.3.6"
119+
dtr_version: "2.3.8"
120120
- scope:
121121
path: "datacenter/dtr/2.2"
122122
values:
123123
ucp_version: "2.1"
124124
dtr_version: "2.2"
125-
docker_image: "docker/dtr:2.2.11"
125+
docker_image: "docker/dtr:2.2.12"
126126
- scope:
127127
path: "datacenter/dtr/2.1"
128128
values:
@@ -138,38 +138,41 @@ defaults:
138138
values:
139139
ucp_org: "docker"
140140
ucp_repo: "ucp"
141-
ucp_version: "3.0.0"
141+
ucp_version: "3.0.4"
142142
- scope: # This is a bit of a hack for the get-support.md topic.
143143
path: "ee"
144144
values:
145145
ucp_org: "docker"
146146
ucp_repo: "ucp"
147147
dtr_repo: "dtr"
148-
ucp_version: "3.0.0"
148+
ucp_version: "3.0.4"
149149
dtr_version: "2.5.0"
150-
dtr_latest_image: "docker/dtr:2.5.0"
150+
dtr_latest_image: "docker/dtr:2.5.3"
151151
- scope:
152152
path: "datacenter/ucp/2.2"
153153
values:
154154
hide_from_sitemap: true
155155
ucp_org: "docker"
156156
ucp_repo: "ucp"
157-
ucp_version: "2.2.9"
157+
ucp_version: "2.2.12"
158158
- scope:
159159
path: "datacenter/ucp/2.1"
160160
values:
161+
hide_from_sitemap: true
161162
ucp_version: "2.1"
162163
dtr_version: "2.2"
163164
docker_image: "docker/ucp:2.1.8"
164165
- scope:
165166
path: "datacenter/ucp/2.0"
166167
values:
168+
hide_from_sitemap: true
167169
ucp_version: "2.0"
168170
dtr_version: "2.1"
169-
docker_image: "docker/ucp:2.0.3"
171+
docker_image: "docker/ucp:2.0.4"
170172
- scope:
171173
path: "datacenter/ucp/1.1"
172174
values:
175+
hide_from_sitemap: true
173176
ucp_version: "1.1"
174177
dtr_version: "2.0"
175178

‎_data/ddc_offline_files_2.yaml

+84-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,62 @@
66
- product: "ucp"
77
version: "3.0"
88
tar-files:
9+
- description: "3.0.4 Linux"
10+
url: https://packages.docker.com/caas/ucp_images_3.0.4.tar.gz
11+
- description: "3.0.4 IBM Z"
12+
url: https://packages.docker.com/caas/ucp_images_s390x_3.0.4.tar.gz
13+
- description: "3.0.4 Windows Server 2016 LTSC"
14+
url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.4.tar.gz
15+
- description: "3.0.4 Windows Server 1709"
16+
url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.4.tar.gz
17+
- description: "3.0.4 Windows Server 1803"
18+
url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.4.tar.gz
19+
- description: "3.0.3 Linux"
20+
url: https://packages.docker.com/caas/ucp_images_3.0.3.tar.gz
21+
- description: "3.0.3 IBM Z"
22+
url: https://packages.docker.com/caas/ucp_images_s390x_3.0.3.tar.gz
23+
- description: "3.0.3 Windows Server 2016 LTSC"
24+
url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.3.tar.gz
25+
- description: "3.0.3 Windows Server 1709"
26+
url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.3.tar.gz
27+
- description: "3.0.3 Windows Server 1803"
28+
url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.3.tar.gz
29+
- description: "3.0.2 Linux"
30+
url: https://packages.docker.com/caas/ucp_images_3.0.2.tar.gz
31+
- description: "3.0.2 Windows Server 2016 LTSC"
32+
url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.2.tar.gz
33+
- description: "3.0.2 Windows Server 1709"
34+
url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.2.tar.gz
35+
- description: "3.0.1 Linux"
36+
url: https://packages.docker.com/caas/ucp_images_3.0.1.tar.gz
37+
- description: "3.0.1 Windows Server 2016 LTSC"
38+
url: https://packages.docker.com/caas/ucp_images_win_3.0.1.tar.gz
939
- description: "3.0.0 Linux"
1040
url: https://packages.docker.com/caas/ucp_images_3.0.0.tar.gz
11-
- description: "3.0.0 Windows"
41+
- description: "3.0.0 Windows Server 2016 LTSC"
1242
url: https://packages.docker.com/caas/ucp_images_win_3.0.0.tar.gz
1343
- product: "ucp"
1444
version: "2.2"
1545
tar-files:
16-
- description: "2.2.9 Linux"
46+
- description: "2.2.12 Linux"
47+
url: https://packages.docker.com/caas/ucp_images_2.2.12.tar.gz
48+
- description: "2.2.12 IBM Z"
49+
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.12.tar.gz
50+
- description: "2.2.12 Windows"
51+
url: https://packages.docker.com/caas/ucp_images_win_2.2.12.tar.gz
52+
- description: "2.2.11 Linux"
53+
url: https://packages.docker.com/caas/ucp_images_2.2.11.tar.gz
54+
- description: "2.2.11 IBM Z"
55+
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.11.tar.gz
56+
- description: "2.2.11 Windows"
57+
url: https://packages.docker.com/caas/ucp_images_win_2.2.11.tar.gz
58+
- description: "2.2.10 Linux"
59+
url: https://packages.docker.com/caas/ucp_images_2.2.10.tar.gz
60+
- description: "2.2.10 IBM Z"
61+
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.10.tar.gz
62+
- description: "2.2.10 Windows"
63+
url: https://packages.docker.com/caas/ucp_images_win_2.2.10.tar.gz
64+
- description: "2.2.10 Linux"
1765
url: https://packages.docker.com/caas/ucp_images_2.2.9.tar.gz
1866
- description: "2.2.9 IBM Z"
1967
url: https://packages.docker.com/caas/ucp_images_s390x_2.2.9.tar.gz
@@ -64,13 +112,41 @@
64112
- product: "dtr"
65113
version: "2.5"
66114
tar-files:
115+
- description: "DTR 2.5.4 Linux x86"
116+
url: https://packages.docker.com/caas/dtr_images_2.5.4.tar.gz
117+
- description: "DTR 2.5.4 IBM Z"
118+
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.4.tar.gz
119+
- description: "DTR 2.5.3 Linux x86"
120+
url: https://packages.docker.com/caas/dtr_images_2.5.3.tar.gz
121+
- description: "DTR 2.5.3 IBM Z"
122+
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.3.tar.gz
123+
- description: "DTR 2.5.2 Linux x86"
124+
url: https://packages.docker.com/caas/dtr_images_2.5.2.tar.gz
125+
- description: "DTR 2.5.2 IBM Z"
126+
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.2.tar.gz
127+
- description: "DTR 2.5.1 Linux x86"
128+
url: https://packages.docker.com/caas/dtr_images_2.5.1.tar.gz
129+
- description: "DTR 2.5.1 IBM Z"
130+
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.1.tar.gz
67131
- description: "DTR 2.5.0 Linux x86"
68132
url: https://packages.docker.com/caas/dtr_images_2.5.0.tar.gz
69-
- description: "DTR 2.4.3 IBM Z"
70-
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.3.tar.gz
133+
- description: "DTR 2.5.0 IBM Z"
134+
url: https://packages.docker.com/caas/dtr_images_s390x_2.5.0.tar.gz
71135
- product: "dtr"
72136
version: "2.4"
73137
tar-files:
138+
- description: "DTR 2.4.6 Linux x86"
139+
url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz
140+
- description: "DTR 2.4.6 IBM Z"
141+
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz
142+
- description: "DTR 2.4.5 Linux x86"
143+
url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz
144+
- description: "DTR 2.4.5 IBM Z"
145+
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.5.tar.gz
146+
- description: "DTR 2.4.4 Linux x86"
147+
url: https://packages.docker.com/caas/dtr_images_2.4.4.tar.gz
148+
- description: "DTR 2.4.4 IBM Z"
149+
url: https://packages.docker.com/caas/dtr_images_s390x_2.4.4.tar.gz
74150
- description: "DTR 2.4.3 Linux x86"
75151
url: https://packages.docker.com/caas/dtr_images_2.4.3.tar.gz
76152
- description: "DTR 2.4.3 IBM Z"
@@ -90,6 +166,10 @@
90166
- product: "dtr"
91167
version: "2.3"
92168
tar-files:
169+
- description: "DTR 2.3.8"
170+
url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz
171+
- description: "DTR 2.3.7"
172+
url: https://packages.docker.com/caas/dtr_images_2.3.7.tar.gz
93173
- description: "DTR 2.3.6"
94174
url: https://packages.docker.com/caas/dtr_images_2.3.6.tar.gz
95175
- description: "DTR 2.3.5"

‎_data/engine-cli/docker_load.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ options:
2828
swarm: false
2929
examples: |-
3030
```bash
31-
$ docker docker image ls
31+
$ docker image ls
3232
3333
REPOSITORY TAG IMAGE ID CREATED SIZE
3434

0 commit comments

Comments
 (0)