Skip to content

Commit 1a193d7

Browse files
author
Misty Stanley-Jones
committed
Revert "Merge pull request docker#437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc13, reversing changes made to 7a11f05.
1 parent 2424da4 commit 1a193d7

File tree

439 files changed

+1517
-941
lines changed

Some content is hidden

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

439 files changed

+1517
-941
lines changed

_data/staging-container/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ VOLUME /usr/src/app
44

55
EXPOSE 4000
66

7-
CMD jekyll clean && jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000
7+
CMD jekyll serve -d /_site --watch -H 0.0.0.0 -P 4000

_data/toc.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,6 @@ toc:
10751075
title: Amazon Web Services
10761076
- path: /machine/drivers/digital-ocean/
10771077
title: Digital Ocean
1078-
- path: /machine/drivers/exoscale/
1079-
title: Exoscale
10801078
- path: /machine/drivers/generic/
10811079
title: Generic
10821080
- path: /machine/drivers/gce/
@@ -1099,6 +1097,8 @@ toc:
10991097
title: VMware vCloud Air
11001098
- path: /machine/drivers/vsphere/
11011099
title: VMware vSphere
1100+
- path: /machine/drivers/exoscale/
1101+
title: exoscale
11021102
- path: /machine/completion/
11031103
title: Command-line Completion
11041104
- sectiontitle: Docker Store

compose/bundles.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
advisory: experimental
33
description: Description of Docker and Compose's experimental support for application
44
bundles
5-
keywords: documentation, docs, docker, compose, bundles, stacks
5+
keywords:
6+
- documentation, docs, docker, compose, bundles, stacks
67
menu:
78
main:
89
parent: workw_compose
@@ -205,4 +206,4 @@ A service has the following fields:
205206
</dl>
206207

207208
> **Note:** Some configuration options are not yet supported in the DAB format,
208-
> including volume mounts.
209+
> including volume mounts.

compose/completion.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Compose CLI reference
3-
keywords: fig, composition, compose, docker, orchestration, cli, reference
3+
keywords:
4+
- fig, composition, compose, docker, orchestration, cli, reference
45
menu:
56
main:
67
parent: workw_compose
@@ -64,4 +65,4 @@ Enjoy working with Compose faster and with less typos!
6465
- [Get started with Rails](rails.md)
6566
- [Get started with WordPress](wordpress.md)
6667
- [Command line reference](./reference/index.md)
67-
- [Compose file reference](compose-file.md)
68+
- [Compose file reference](compose-file.md)

compose/compose-file.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
aliases:
33
- /compose/yml
44
description: Compose file reference
5-
keywords: fig, composition, compose, docker
5+
keywords:
6+
- fig, composition, compose, docker
67
menu:
78
main:
89
parent: workw_compose
@@ -1168,4 +1169,4 @@ If you forget and use a single dollar sign (`$`), Compose interprets the value a
11681169
- [Get started with Django](django.md)
11691170
- [Get started with Rails](rails.md)
11701171
- [Get started with WordPress](wordpress.md)
1171-
- [Command line reference](./reference/index.md)
1172+
- [Command line reference](./reference/index.md)

compose/django.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Getting started with Docker Compose and Django
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
parent: workw_compose
@@ -189,4 +190,4 @@ In this section, you set up the database connection for Django.
189190
- [Get started with Rails](rails.md)
190191
- [Get started with WordPress](wordpress.md)
191192
- [Command line reference](./reference/index.md)
192-
- [Compose file reference](compose-file.md)
193+
- [Compose file reference](compose-file.md)

compose/env-file.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Declaring default environment variables in file
3-
keywords: fig, composition, compose, docker, orchestration, environment, env file
3+
keywords:
4+
- fig, composition, compose, docker, orchestration, environment, env file
45
menu:
56
main:
67
parent: workw_compose
@@ -38,4 +39,4 @@ file, but can also be used to define the following
3839

3940
- [User guide](index.md)
4041
- [Command line reference](./reference/index.md)
41-
- [Compose file reference](compose-file.md)
42+
- [Compose file reference](compose-file.md)

compose/environment-variables.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: How to set, use and manage environment variables in Compose
3-
keywords: fig, composition, compose, docker, orchestration, environment, variables, env file
3+
keywords:
4+
- fig, composition, compose, docker, orchestration, environment, variables, env file
45
menu:
56
main:
67
parent: workw_compose
@@ -103,4 +104,4 @@ Several environment variables are available for you to configure the Docker Comp
103104

104105
## Environment variables created by links
105106

106-
When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.
107+
When using the ['links' option](compose-file.md#links) in a [v1 Compose file](compose-file.md#version-1), environment variables will be created for each link. They are documented in the [Link environment variables reference](link-env-deprecated.md). Please note, however, that these variables are deprecated - you should just use the link alias as a hostname instead.

compose/extends.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
description: How to use Docker Compose's extends keyword to share configuration between
33
files and projects
4-
keywords: fig, composition, compose, docker, orchestration, documentation, docs
4+
keywords:
5+
- fig, composition, compose, docker, orchestration, documentation, docs
56
menu:
67
main:
78
parent: workw_compose
@@ -350,4 +351,4 @@ In the case of `environment`, `labels`, `volumes` and `devices`, Compose
350351
- [Get started with Rails](rails.md)
351352
- [Get started with WordPress](wordpress.md)
352353
- [Command line reference](./reference/index.md)
353-
- [Compose file reference](compose-file.md)
354+
- [Compose file reference](compose-file.md)

compose/gettingstarted.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Getting started with Docker Compose
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
parent: workw_compose
@@ -186,4 +187,4 @@ At this point, you have seen the basics of how Compose works.
186187
- Next, try the quick start guide for [Django](django.md),
187188
[Rails](rails.md), or [WordPress](wordpress.md).
188189
- [Explore the full list of Compose commands](./reference/index.md)
189-
- [Compose configuration file reference](compose-file.md)
190+
- [Compose configuration file reference](compose-file.md)

compose/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Introduction and Overview of Compose
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
identifier: workw_compose
@@ -25,4 +26,4 @@ Compose is a tool for defining and running multi-container Docker applications.
2526

2627
To see a detailed list of changes for past and current releases of Docker
2728
Compose, please refer to the
28-
[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).
29+
[CHANGELOG](https://github.com/docker/compose/blob/master/CHANGELOG.md).

compose/install.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: How to install Docker Compose
3-
keywords: compose, orchestration, install, installation, docker, documentation
3+
keywords:
4+
- compose, orchestration, install, installation, docker, documentation
45
menu:
56
main:
67
parent: workw_compose
@@ -131,4 +132,4 @@ To uninstall Docker Compose if you installed using `pip`:
131132
- [Get started with Rails](rails.md)
132133
- [Get started with WordPress](wordpress.md)
133134
- [Command line reference](./reference/index.md)
134-
- [Compose file reference](compose-file.md)
135+
- [Compose file reference](compose-file.md)

compose/link-env-deprecated.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
aliases:
33
- /compose/env
44
description: Compose CLI reference
5-
keywords: fig, composition, compose, docker, orchestration, cli, reference
5+
keywords:
6+
- fig, composition, compose, docker, orchestration, cli, reference
67
menu:
78
main:
89
parent: workw_compose
@@ -45,4 +46,4 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
4546
- [User guide](index.md)
4647
- [Installing Compose](install.md)
4748
- [Command line reference](./reference/index.md)
48-
- [Compose file reference](compose-file.md)
49+
- [Compose file reference](compose-file.md)

compose/networking.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: How Compose sets up networking between containers
3-
keywords: documentation, docs, docker, compose, orchestration, containers, networking
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers, networking
45
menu:
56
main:
67
parent: workw_compose
@@ -149,4 +150,4 @@ If you want your containers to join a pre-existing network, use the [`external`
149150
external:
150151
name: my-pre-existing-network
151152

152-
Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
153+
Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.

compose/overview.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Introduction and Overview of Compose
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
parent: workw_compose
@@ -183,4 +184,4 @@ individuals, we have a number of open channels for communication.
183184

184185
* To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).
185186

186-
For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).
187+
For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).

compose/production.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Guide to using Docker Compose in production
3-
keywords: documentation, docs, docker, compose, orchestration, containers, production
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers, production
45
menu:
56
main:
67
parent: workw_compose
@@ -83,4 +84,4 @@ Read more about the Compose/Swarm integration in the
8384

8485
- [Installing Compose](install.md)
8586
- [Command line reference](./reference/index.md)
86-
- [Compose file reference](compose-file.md)
87+
- [Compose file reference](compose-file.md)

compose/rails.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Getting started with Docker Compose and Rails
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
parent: workw_compose
@@ -170,4 +171,4 @@ up`.
170171
- [Get started with Django](django.md)
171172
- [Get started with WordPress](wordpress.md)
172173
- [Command line reference](./reference/index.md)
173-
- [Compose file reference](compose-file.md)
174+
- [Compose file reference](compose-file.md)

compose/swarm.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: How to use Compose and Swarm together to deploy apps to multi-host clusters
3-
keywords: documentation, docs, docker, compose, orchestration, containers, swarm
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers, swarm
45
menu:
56
main:
67
parent: workw_compose
@@ -176,4 +177,4 @@ them.
176177
- "affinity:image==redis"
177178

178179
For the full set of available filters and expressions, see the [Swarm
179-
documentation](/swarm/scheduler/filter.md).
180+
documentation](/swarm/scheduler/filter.md).

compose/wordpress.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
description: Getting started with Compose and WordPress
3-
keywords: documentation, docs, docker, compose, orchestration, containers
3+
keywords:
4+
- documentation, docs, docker, compose, orchestration, containers
45
menu:
56
main:
67
parent: workw_compose
@@ -112,4 +113,4 @@ At this point, WordPress should be running on port `8000` of your Docker Host, a
112113
- [Get started with Django](django.md)
113114
- [Get started with Rails](rails.md)
114115
- [Command line reference](./reference/index.md)
115-
- [Compose file reference](compose-file.md)
116+
- [Compose file reference](compose-file.md)

cs-engine/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
aliases:
33
- /docker-trusted-registry/cs-engine/
44
description: Learn more about the Commercially Supported Docker Engine.
5-
keywords: docker, engine, documentation
5+
keywords:
6+
- docker, engine, documentation
67
menu:
78
main:
89
identifier: menu_csengine
@@ -16,4 +17,4 @@ This section includes the following topics:
1617

1718
* [Install CS Docker Engine](install.md)
1819
* [Upgrade](upgrade.md)
19-
* [Release notes](release-notes/release-notes.md)
20+
* [Release notes](release-notes/release-notes.md)

cs-engine/install.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ aliases:
44
- /docker-trusted-registry/install/install-csengine/
55
- /docker-trusted-registry/cs-engine/install/
66
description: Learn how to install the commercially supported version of Docker Engine.
7-
keywords: docker, engine, dtr, install
7+
keywords:
8+
- docker, engine, dtr, install
89
menu:
910
main:
1011
identifier: csengine_install
@@ -197,4 +198,4 @@ to the `docker` group.
197198
$ sudo usermod -a -G docker $USER
198199
```
199200

200-
8. Log out and log back in to have your new permissions take effect.
201+
8. Log out and log back in to have your new permissions take effect.

cs-engine/release-notes/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
aliases:
33
- /docker-trusted-registry/cs-engine/release-notes/
44
description: The release notes for CS Docker Engine.
5-
keywords: docker, engine, release notes
5+
keywords:
6+
- docker, engine, release notes
67
menu:
78
main:
89
identifier: menu_csengine_release_notes
@@ -14,4 +15,4 @@ title: Release notes
1415
# Docker CS Engine release notes
1516

1617
* [Release notes](release-notes.md)
17-
* [Prior release notes](prior-release-notes.md)
18+
* [Prior release notes](prior-release-notes.md)

cs-engine/release-notes/prior-release-notes.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ aliases:
33
- /docker-trusted-registry/cse-prior-release-notes/
44
- /docker-trusted-registry/cs-engine/release-notes/prior-release-notes/
55
description: Archived release notes for commercially supported Docker Engine
6-
keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, release, commercially supported Docker Engine
6+
keywords:
7+
- docker, documentation, about, technology, understanding, enterprise, hub, registry,release,
8+
commercially supported Docker Engine
79
menu:
810
main:
911
identifier: csengine_prior_release_notes
@@ -339,4 +341,4 @@ Because this addition is preventative, no CVE-ID is requested.
339341
(23 Apr 2015)
340342

341343
First release, see the [Docker Engine 1.6.0 Release notes](/v1.6/release-notes/)
342-
for more details.
344+
for more details.

cs-engine/release-notes/release-notes.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ aliases:
33
- /docker-trusted-registry/cse-release-notes/
44
- /docker-trusted-registry/cs-engine/release-notes/release-notes/
55
description: Commercially supported Docker Engine release notes
6-
keywords: docker, documentation, about, technology, understanding, enterprise, hub,
7-
registry, Commercially Supported Docker Engine, release notes
6+
keywords:
7+
- docker, documentation, about, technology, understanding, enterprise, hub, registry,
8+
Commercially Supported Docker Engine, release notes
89
menu:
910
main:
1011
identifier: csengine_release_notes
@@ -111,4 +112,4 @@ https://github.com/docker/docker/issues/22486
111112
## CS Engine 1.11.1-cs1
112113
(27 April 2016)
113114

114-
In this release the CS Engine is supported on RHEL 7.2 OS
115+
In this release the CS Engine is supported on RHEL 7.2 OS

0 commit comments

Comments
 (0)