Browse code

Merge pull request #31023 from mstanleyjones/fix_liquid_errors

Fix some Liquid errors
(cherry picked from commit 88de5c36c7afdae095322c64c0472d27c4ff3f43)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2017/02/17 11:13:15
Showing 3 changed files
... ...
@@ -183,7 +183,11 @@ Log tags are now generated in a standard way across different logging drivers.
183 183
 Because of which, the driver specific log tag options `syslog-tag`, `gelf-tag` and
184 184
 `fluentd-tag` have been deprecated in favor of the generic `tag` option.
185 185
 
186
-    docker --log-driver=syslog --log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"
186
+```bash
187
+{% raw %}
188
+docker --log-driver=syslog --log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"
189
+{% endraw %}
190
+```
187 191
 
188 192
 ### LXC built-in exec driver
189 193
 **Deprecated In Release: [v1.8.0](https://github.com/docker/docker/releases/tag/v1.8.0)**
... ...
@@ -20,7 +20,7 @@ title: Managed plugin system
20 20
 * [Debugging plugins](index.md#debugging-plugins)
21 21
 
22 22
 Docker Engine's plugins system allows you to install, start, stop, and remove
23
-plugins using Docker Engine. 
23
+plugins using Docker Engine.
24 24
 
25 25
 For information about the legacy plugin system available in Docker Engine 1.12
26 26
 and earlier, see [Understand legacy Docker Engine plugins](legacy_plugins.md).
... ...
@@ -78,7 +78,7 @@ enabled, and use it to create a volume.
78 78
 3.  Create a volume using the plugin.
79 79
     This example mounts the `/remote` directory on host `1.2.3.4` into a
80 80
     volume named `sshvolume`.   
81
-   
81
+
82 82
     This volume can now be mounted into containers.
83 83
 
84 84
     ```bash
... ...
@@ -110,7 +110,7 @@ enabled, and use it to create a volume.
110 110
 6.  Remove the volume `sshvolume`
111 111
     ```bash
112 112
     docker volume rm sshvolume
113
-    
113
+
114 114
     sshvolume
115 115
     ```
116 116
 To disable a plugin, use the `docker plugin disable` command. To completely
... ...
@@ -122,10 +122,10 @@ commands and options, see the
122 122
 
123 123
 In swarm mode, it is possible to create a service that allows for attaching
124 124
 to networks or mounting volumes. Swarm schedules services based on plugin availability
125
-on a node. In this example, a volume plugin is installed on a swarm worker and a volume 
125
+on a node. In this example, a volume plugin is installed on a swarm worker and a volume
126 126
 is created using the plugin. In the manager, a service is created with the relevant
127 127
 mount options. It can be observed that the service is scheduled to run on the worker
128
-node with the said volume plugin and volume. 
128
+node with the said volume plugin and volume.
129 129
 
130 130
 In the following example, node1 is the manager and node2 is the worker.
131 131
 
... ...
@@ -152,7 +152,7 @@ In the following example, node1 is the manager and node2 is the worker.
152 152
     Status: Downloaded newer image for tiborvass/sample-volume-plugin:latest
153 153
     Installed plugin tiborvass/sample-volume-plugin
154 154
     ```
155
-	
155
+
156 156
     ```bash
157 157
     $ docker volume create -d tiborvass/sample-volume-plugin --name pluginVol
158 158
     ```
... ...
@@ -163,15 +163,17 @@ In the following example, node1 is the manager and node2 is the worker.
163 163
     $ docker service create --name my-service --mount type=volume,volume-driver=tiborvass/sample-volume-plugin,source=pluginVol,destination=/tmp busybox top
164 164
 
165 165
     $ docker service ls
166
-    z1sj8bb8jnfn  my-service   replicated  1/1       busybox:latest 
166
+    z1sj8bb8jnfn  my-service   replicated  1/1       busybox:latest
167 167
     ```
168 168
     docker service ls shows service 1 instance of service running.
169 169
 
170 170
 4. Observe the task getting scheduled in node 2:
171 171
 
172 172
     ```bash
173
-    $ docker ps --format '{{.ID}}\t {{.Status}} {{.Names}} {{.Command}}' 
173
+    {% raw %}
174
+    $ docker ps --format '{{.ID}}\t {{.Status}} {{.Names}} {{.Command}}'
174 175
     83fc1e842599     Up 2 days my-service.1.9jn59qzn7nbc3m0zt1hij12xs "top"
176
+    {% endraw %}
175 177
     ```
176 178
 
177 179
 ## Developing a plugin
... ...
@@ -228,7 +230,7 @@ with Docker Engine. This plugin has no runtime parameters.
228 228
 A new plugin can be created by running
229 229
 `docker plugin create <plugin-name> ./path/to/plugin/data` where the plugin
230 230
 data contains a plugin configuration file `config.json` and a root filesystem
231
-in subdirectory `rootfs`. 
231
+in subdirectory `rootfs`.
232 232
 
233 233
 After that the plugin `<plugin-name>` will show up in `docker plugin ls`.
234 234
 Plugins can be pushed to remote registries with
... ...
@@ -292,7 +294,7 @@ $ docker-runc exec -t f52a3df433b9aceee436eaada0752f5797aab1de47e5485f1690a073b8
292 292
 #### Using curl to debug plugin socket issues.
293 293
 
294 294
 To verify if the plugin API socket that the docker daemon communicates with
295
-is responsive, use curl. In this example, we will make API calls from the 
295
+is responsive, use curl. In this example, we will make API calls from the
296 296
 docker host to volume and network plugins using curl 7.47.0 to ensure that
297 297
 the plugin is listening on the said socket. For a well functioning plugin,
298 298
 these basic requests should work. Note that plugin sockets are available on the host under `/var/run/docker/plugins/<pluginID>`
... ...
@@ -309,8 +311,8 @@ curl -H "Content-Type: application/json" -XPOST -d '{}' --unix-socket /var/run/d
309 309
 
310 310
 {"Scope":"local"}
311 311
 ```
312
-When using curl 7.5 and above, the URL should be of the form 
313
-`http://hostname/APICall`, where `hostname` is the valid hostname where the 
312
+When using curl 7.5 and above, the URL should be of the form
313
+`http://hostname/APICall`, where `hostname` is the valid hostname where the
314 314
 plugin is installed and `APICall` is the call to the plugin API.
315 315
 
316 316
 For example, `http://localhost/VolumeDriver.List`
... ...
@@ -287,7 +287,9 @@ and `Parent`. `Parent` may be an empty string, in which case there is no parent.
287 287
 
288 288
 **Response**:
289 289
 ```
290
+{% raw %}
290 291
 {{ TAR STREAM }}
292
+{% endraw %}
291 293
 ```
292 294
 
293 295
 ### /GraphDriver.Changes
... ...
@@ -330,7 +332,9 @@ Respond with a non-empty string error if an error occurred.
330 330
 
331 331
 **Request**:
332 332
 ```
333
+{% raw %}
333 334
 {{ TAR STREAM }}
335
+{% endraw %}
334 336
 ```
335 337
 
336 338
 Extract the changeset from the given diff into the layer with the specified `ID`