Skip to content

Commit f47930b

Browse files
usha-mandyausha-mandya
authored
Merge branch 'master' into build-secrets
2 parents fc7a472 + 07cd9ab commit f47930b

File tree

71 files changed

+690
-470
lines changed

Some content is hidden

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

71 files changed

+690
-470
lines changed

‎_data/compose-cli/docker_compose_images.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
command: docker compose images
2+
short: List images used by the created containers.
3+
long: List images used by the created containers.
4+
usage: docker compose images [options] [SERVICE...]
5+
pname: docker compose
6+
plink: docker_compose.yaml
7+
options:
8+
- option: quiet
9+
shorthand: q
10+
value_type: bool
11+
default_value: "false"
12+
description: Only display IDs
13+
deprecated: false
14+
experimental: false
15+
experimentalcli: false
16+
kubernetes: false
17+
swarm: false
18+
deprecated: false
19+
experimental: false
20+
experimentalcli: false
21+
kubernetes: false
22+
swarm: false

‎_data/toc.yaml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ reference:
526526
title: docker compose events
527527
- path: /engine/reference/commandline/compose_exec/
528528
title: docker compose exec
529+
- path: /engine/reference/commandline/compose_images/
530+
title: docker compose images
529531
- path: /engine/reference/commandline/compose_kill/
530532
title: docker compose kill
531533
- path: /engine/reference/commandline/compose_logs/
@@ -946,7 +948,7 @@ reference:
946948
title: docker wait
947949
- sectiontitle: Docker Compose CLI reference
948950
section:
949-
- path: /compose/reference/overview/
951+
- path: /compose/reference/
950952
title: Overview of docker-compose CLI
951953
- path: /compose/reference/envvars/
952954
title: CLI environment variables
@@ -966,6 +968,8 @@ reference:
966968
title: docker-compose exec
967969
- path: /compose/reference/help/
968970
title: docker-compose help
971+
- path: /compose/reference/images/
972+
title: docker-compose images
969973
- path: /compose/reference/kill/
970974
title: docker-compose kill
971975
- path: /compose/reference/logs/
@@ -1134,25 +1138,25 @@ samples:
11341138
section:
11351139
- path: /samples/
11361140
title: Samples home
1137-
- path: /engine/examples/apt-cacher-ng/
1141+
- path: /samples/apt-cacher-ng/
11381142
title: apt-cacher-ng
1139-
- path: /engine/examples/dotnetcore/
1143+
- path: /samples/dotnetcore/
11401144
title: ASP.NET Core application
1141-
- path: /compose/aspnet-mssql-compose/
1145+
- path: /samples/aspnet-mssql-compose/
11421146
title: ASP.NET Core + SQL Server on Linux
1143-
- path: /engine/examples/couchdb_data_volumes/
1147+
- path: /samples/couchdb_data_volumes/
11441148
title: CouchDB
1145-
- path: /compose/django/
1149+
- path: /samples/django/
11461150
title: Django and PostgreSQL
1147-
- path: /compose/wordpress/
1151+
- path: /samples/wordpress/
11481152
title: WordPress
1149-
- path: /engine/examples/postgresql_service/
1153+
- path: /samples/postgresql_service/
11501154
title: PostgreSQL
1151-
- path: /compose/rails/
1155+
- path: /samples/rails/
11521156
title: Rails and PostgreSQL
1153-
- path: /engine/examples/running_riak_service/
1157+
- path: /samples/running_riak_service/
11541158
title: Riak
1155-
- path: /engine/examples/running_ssh_service/
1159+
- path: /samples/running_ssh_service/
11561160
title: SSHd
11571161
- path: /samples/#library-references
11581162
title: Library references

‎_scss/_perldoc.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
// Prevent selecting comments, command-output and command-prompt in shell
2222
// examples that use the "console" lexer/highlighter to allow easier copying.
2323
// See https://github.com/rouge-ruby/rouge/issues/1023
24-
.highlight .c,
25-
.highlight .go,
26-
.highlight .gp
24+
.language-console .highlight .c,
25+
.language-console .highlight .go,
26+
.language-console .highlight .gp
2727
{
2828
-webkit-user-select: none;
2929
-moz-user-select: none;
@@ -34,7 +34,7 @@
3434
// Show a "text" cursor for the prompt. Even though the prompt itself is not
3535
// selectable, make it appear as if it is, so that users don't get confused
3636
// when they try to select an example for copying.
37-
.highlight .gp {
37+
.language-console .highlight .gp {
3838
cursor: text;
3939
}
4040

‎_website-config-docs-stage.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@
182182
"KeyPrefixEquals": "ee/licensing/"
183183
},
184184
"Redirect": {
185-
"HostName": "docs.mirantis.com",
185+
"HostName": "docs-stage.docker.com",
186186
"HttpRedirectCode": null,
187187
"Protocol": "https",
188188
"ReplaceKeyPrefixWith": null,
189-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/licensing.html"
189+
"ReplaceKeyWith": ""
190190
}
191191
},
192192
{
@@ -195,11 +195,11 @@
195195
"KeyPrefixEquals": "ee/get-support/"
196196
},
197197
"Redirect": {
198-
"HostName": "docs.mirantis.com",
198+
"HostName": "docs-stage.docker.com",
199199
"HttpRedirectCode": null,
200200
"Protocol": "https",
201201
"ReplaceKeyPrefixWith": null,
202-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/get-support.html"
202+
"ReplaceKeyWith": ""
203203
}
204204
},
205205
{
@@ -208,11 +208,11 @@
208208
"KeyPrefixEquals": "ee/cluster/"
209209
},
210210
"Redirect": {
211-
"HostName": "docs.mirantis.com",
211+
"HostName": "docs-stage.docker.com",
212212
"HttpRedirectCode": null,
213213
"Protocol": "https",
214214
"ReplaceKeyPrefixWith": null,
215-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/cluster.html"
215+
"ReplaceKeyWith": ""
216216
}
217217
},
218218
{
@@ -221,11 +221,11 @@
221221
"KeyPrefixEquals": "ee/supported-platforms/"
222222
},
223223
"Redirect": {
224-
"HostName": "docs.mirantis.com",
224+
"HostName": "docs-stage.docker.com",
225225
"HttpRedirectCode": null,
226226
"Protocol": "https",
227227
"ReplaceKeyPrefixWith": null,
228-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/dee-intro.html"
228+
"ReplaceKeyWith": ""
229229
}
230230
},
231231
{
@@ -234,11 +234,11 @@
234234
"KeyPrefixEquals": "ee/ucp/"
235235
},
236236
"Redirect": {
237-
"HostName": "docs.mirantis.com",
237+
"HostName": "docs-stage.docker.com",
238238
"HttpRedirectCode": null,
239239
"Protocol": "https",
240240
"ReplaceKeyPrefixWith": null,
241-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/ucp.html"
241+
"ReplaceKeyWith": ""
242242
}
243243
},
244244
{
@@ -247,11 +247,11 @@
247247
"KeyPrefixEquals": "ee/dtr/"
248248
},
249249
"Redirect": {
250-
"HostName": "docs.mirantis.com",
250+
"HostName": "docs-stage.docker.com",
251251
"HttpRedirectCode": null,
252252
"Protocol": "https",
253253
"ReplaceKeyPrefixWith": null,
254-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/dtr.html"
254+
"ReplaceKeyWith": ""
255255
}
256256
},
257257
{
@@ -260,11 +260,11 @@
260260
"KeyPrefixEquals": "compliance/"
261261
},
262262
"Redirect": {
263-
"HostName": "docs.mirantis.com",
263+
"HostName": "docs-stage.docker.com",
264264
"HttpRedirectCode": null,
265265
"Protocol": "https",
266266
"ReplaceKeyPrefixWith": null,
267-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/compliance.html"
267+
"ReplaceKeyWith": ""
268268
}
269269
},
270270
{
@@ -273,11 +273,11 @@
273273
"KeyPrefixEquals": "datacenter/"
274274
},
275275
"Redirect": {
276-
"HostName": "docs.mirantis.com",
276+
"HostName": "docs-stage.docker.com",
277277
"HttpRedirectCode": null,
278278
"Protocol": "https",
279279
"ReplaceKeyPrefixWith": null,
280-
"ReplaceKeyWith": "docker-enterprise/v2.1/"
280+
"ReplaceKeyWith": ""
281281
}
282282
},
283283
{
@@ -286,11 +286,11 @@
286286
"KeyPrefixEquals": "v18.09/ee/"
287287
},
288288
"Redirect": {
289-
"HostName": "docs.mirantis.com",
289+
"HostName": "docs-stage.docker.com",
290290
"HttpRedirectCode": null,
291291
"Protocol": "https",
292292
"ReplaceKeyPrefixWith": null,
293-
"ReplaceKeyWith": "docker-enterprise/v2.1/"
293+
"ReplaceKeyWith": ""
294294
}
295295
},
296296
{
@@ -299,11 +299,11 @@
299299
"KeyPrefixEquals": "v18.03/ee/"
300300
},
301301
"Redirect": {
302-
"HostName": "docs.mirantis.com",
302+
"HostName": "docs-stage.docker.com",
303303
"HttpRedirectCode": null,
304304
"Protocol": "https",
305305
"ReplaceKeyPrefixWith": null,
306-
"ReplaceKeyWith": "docker-enterprise/v18.03/"
306+
"ReplaceKeyWith": ""
307307
}
308308
},
309309
{
@@ -312,11 +312,11 @@
312312
"KeyPrefixEquals": "v17.06/enterprise/"
313313
},
314314
"Redirect": {
315-
"HostName": "docs.mirantis.com",
315+
"HostName": "docs-stage.docker.com",
316316
"HttpRedirectCode": null,
317317
"Protocol": "https",
318318
"ReplaceKeyPrefixWith": null,
319-
"ReplaceKeyWith": "docker-enterprise/v2.0/"
319+
"ReplaceKeyWith": ""
320320
}
321321
},
322322
{
@@ -325,11 +325,11 @@
325325
"KeyPrefixEquals": "ee/docker-ee/"
326326
},
327327
"Redirect": {
328-
"HostName": "docs.mirantis.com",
328+
"HostName": "docs-stage.docker.com",
329329
"HttpRedirectCode": null,
330330
"Protocol": "https",
331331
"ReplaceKeyPrefixWith": null,
332-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/docker-engine-enterprise/dee-linux.html"
332+
"ReplaceKeyWith": ""
333333
}
334334
},
335335
{
@@ -338,11 +338,11 @@
338338
"KeyPrefixEquals": "ee/"
339339
},
340340
"Redirect": {
341-
"HostName": "docs.mirantis.com",
341+
"HostName": "docs-stage.docker.com",
342342
"HttpRedirectCode": null,
343343
"Protocol": "https",
344344
"ReplaceKeyPrefixWith": null,
345-
"ReplaceKeyWith": "docker-enterprise/v3.0/dockeree-products/index.html"
345+
"ReplaceKeyWith": ""
346346
}
347347
},
348348
{

0 commit comments

Comments
 (0)