docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert pull request #48 

Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
This commit is contained in:
Benjamin R. Haskell 2016-10-07 00:45:16 -04:00
parent bdc4a3b934
commit 65ec3a3763
35 changed files with 0 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apidocs/cloud-api-source/source/includes/node.md
View File

@ -1,5 +1,3 @@
{% raw %}
# Nodes
## Node
@ -376,5 +374,3 @@ Available in Docker Cloud's **REST API**
Parameter | Description
--------- | -----------
uuid | The UUID of the node to terminate
{% endraw %}

4
apidocs/cloud-api-source/source/includes/stack.md
View File

@ -1,5 +1,3 @@
{% raw %}
# Stacks
## Stack
@ -568,5 +566,3 @@ Available in Docker Cloud's **REST API**
Parameter | Description
--------- | -----------
uuid | The UUID of the stack to terminate
{% endraw %}

4
engine/admin/formatting.md
View File

@ -9,8 +9,6 @@ menu:
title: Format command and log output
---
{% raw %}
# Formatting reference
Docker uses [Go templates](https://golang.org/pkg/text/template/) to allow users manipulate the output format
@ -66,5 +64,3 @@ Title capitalizes a string.
Upper turns a string into its upper case representation.
$ docker inspect --format "{{upper .Name}}" container
{% endraw %}

4
engine/admin/logging/fluentd.md
View File

@ -10,8 +10,6 @@ menu:
title: Fluentd logging driver
---
{% raw %}
# Fluentd logging driver
The `fluentd` logging driver sends container logs to the
@ -115,5 +113,3 @@ aggregate store.
3. Start one or more containers with the `fluentd` logging driver:
$ docker run --log-driver=fluentd your/application
{% endraw %}

4
engine/admin/logging/log_tags.md
View File

@ -11,8 +11,6 @@ menu:
title: Log tags for logging driver
---
{% raw %}
# Log Tags
The `tag` log option specifies how to format a tag that identifies the
@ -68,5 +66,3 @@ Apr 1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: + exec app
Apr 1 15:22:17 ip-10-27-39-73 docker/logtester.1234[45499]: 2016-04-01 15:22:17.075416751 +0000 UTC stderr msg: 1
```
{% endraw %}

4
engine/admin/logging/overview.md
View File

@ -11,8 +11,6 @@ menu:
title: Configuring Logging Drivers
---
{% raw %}
# Configure logging drivers
The container can have a different logging driver than the Docker daemon. Use
@ -307,5 +305,3 @@ The Google Cloud Logging driver supports the following options:
For detailed information about working with this logging driver, see the
[Google Cloud Logging driver](gcplogs.md). reference documentation.
{% endraw %}

4
engine/admin/logging/splunk.md
View File

@ -10,8 +10,6 @@ menu:
title: Splunk logging driver
---
{% raw %}
# Splunk logging driver
The `splunk` logging driver sends container logs to
@ -69,5 +67,3 @@ The `SplunkServerDefaultCert` is automatically generated by Splunk certificates.
--env "TEST=false"
--label location=west
your/application
{% endraw %}

4
engine/deprecated.md
View File

@ -11,8 +11,6 @@ menu:
title: Deprecated Engine Features
---
{% raw %}
# Deprecated Engine Features
The following list of features are deprecated in Engine.
@ -189,5 +187,3 @@ Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the
- DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE is now named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE
- DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE is now named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.18.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.18
---
{% raw %}
# Docker Remote API v1.18
## 1. Brief introduction
@ -2135,5 +2133,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.19.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.19
---
{% raw %}
# Docker Remote API v1.19
## 1. Brief introduction
@ -2215,5 +2213,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.20.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.20
---
{% raw %}
# Docker Remote API v1.20
## 1. Brief introduction
@ -2366,5 +2364,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.21.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.21
---
{% raw %}
# Docker Remote API v1.21
## 1. Brief introduction
@ -2937,5 +2935,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.22.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.22
---
{% raw %}
# Docker Remote API v1.22
## 1. Brief introduction
@ -3273,5 +3271,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.23.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.23
---
{% raw %}
# Docker Remote API v1.23
## 1. Brief introduction
@ -3389,5 +3387,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.24.md
View File

@ -9,8 +9,6 @@ menu:
title: Remote API v1.24
---
{% raw %}
# Docker Remote API v1.24
# 1. Brief introduction
@ -5247,5 +5245,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/api/docker_remote_api_v1.25.md
View File

@ -10,8 +10,6 @@ menu:
title: Remote API v1.25
---
{% raw %}
# Docker Remote API v1.25
# 1. Brief introduction
@ -5283,5 +5281,3 @@ To set cross origin requests to the remote api please give values to
default or blank means CORS disabled
$ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
{% endraw %}

4
engine/reference/commandline/cli.md
View File

@ -9,8 +9,6 @@ menu:
title: Use the Docker command line
---
{% raw %}
# Use the Docker command line
To list available commands, either run `docker` with no parameters
@ -224,5 +222,3 @@ Sometimes, multiple options can call for a more complex value string as for
Options like `--name=""` expect a string, and they
can only be specified once. Options like `-c=0`
expect an integer, and they can only be specified once.
{% endraw %}

4
engine/reference/commandline/commit.md
View File

@ -8,8 +8,6 @@ menu:
title: commit
---
{% raw %}
# commit
```markdown
@ -86,5 +84,3 @@ created. Supported `Dockerfile` instructions:
89373736e2e7 testimage:version4 "apachectl -DFOREGROU" 3 seconds ago Up 2 seconds 80/tcp
c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours
197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours
{% endraw %}

4
engine/reference/commandline/images.md
View File

@ -8,8 +8,6 @@ menu:
title: images
---
{% raw %}
# images
```markdown
@ -276,5 +274,3 @@ can use:
746b819f315e postgres 9.3
746b819f315e postgres 9.3.5
746b819f315e postgres latest
{% endraw %}

4
engine/reference/commandline/inspect.md
View File

@ -8,8 +8,6 @@ menu:
title: inspect
---
{% raw %}
# inspect
```markdown
@ -82,5 +80,3 @@ Docker adds a template function, `json`, which can be applied to get
results in JSON format.
$ docker inspect --format='{{json .Config}}' $INSTANCE_ID
{% endraw %}

4
engine/reference/commandline/node_inspect.md
View File

@ -8,8 +8,6 @@ menu:
title: node inspect
---
{% raw %}
**Warning:** this command is part of the Swarm management feature introduced in Docker 1.12, and might be subject to non backward-compatible changes.
# node inspect
@ -128,5 +126,3 @@ Example output:
* [node ps](node_ps.md)
* [node ls](node_ls.md)
* [node rm](node_rm.md)
{% endraw %}

4
engine/reference/commandline/ps.md
View File

@ -8,8 +8,6 @@ menu:
title: ps
---
{% raw %}
# ps
```markdown
@ -369,5 +367,3 @@ a87ecb4f327c com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd
c1d3b0166030 com.docker.swarm.node=debian,com.docker.swarm.cpu=6
41d50ecd2f57 com.docker.swarm.node=fedora,com.docker.swarm.cpu=3,com.docker.swarm.storage=ssd
```
{% endraw %}

4
engine/reference/commandline/service_inspect.md
View File

@ -8,8 +8,6 @@ menu:
title: service inspect
---
{% raw %}
**Warning:** this command is part of the Swarm management feature introduced in Docker 1.12, and might be subject to non backward-compatible changes.
# service inspect
@ -155,5 +153,3 @@ $ docker service inspect --format='{{.Spec.Mode.Replicated.Replicas}}' redis
* [service scale](service_scale.md)
* [service ps](service_ps.md)
* [service update](service_update.md)
{% endraw %}

4
engine/reference/commandline/version.md
View File

@ -8,8 +8,6 @@ menu:
title: version
---
{% raw %}
# version
```markdown
@ -58,5 +56,3 @@ describes all the details of the format.
$ docker version --format '{{json .}}'
{"Client":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"},"ServerOK":true,"Server":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","KernelVersion":"3.13.2-gentoo","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"}}
{% endraw %}

4
engine/reference/commandline/volume_inspect.md
View File

@ -8,8 +8,6 @@ menu:
title: volume inspect
---
{% raw %}
# volume inspect
```markdown
@ -51,5 +49,3 @@ Example output:
* [volume ls](volume_ls.md)
* [volume rm](volume_rm.md)
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
{% endraw %}

4
engine/reference/run.md
View File

@ -11,8 +11,6 @@ menu:
title: Docker run reference
---
{% raw %}
# Docker run reference
Docker runs processes in isolated containers. A container is a process
@ -1533,5 +1531,3 @@ root directory (`/`), but the developer can set a different default with the
Dockerfile `WORKDIR` command. The operator can override this with:
-w="": Working directory inside the container
{% endraw %}

4
engine/swarm/admin_guide.md
View File

@ -12,8 +12,6 @@ menu:
title: Swarm administration guide
---
{% raw %}
# Administer and maintain a swarm of Docker Engines
When you run a swarm of Docker Engines, **manager nodes** are the key components
@ -264,5 +262,3 @@ The `--force-new-cluster` flag puts the Docker Engine into swarm mode as a
manager node of a single-node swarm. It discards swarm membership information
that existed before the loss of the quorum but it retains data necessary to the
Swarm such as services, tasks and the list of worker nodes.
{% endraw %}

4
engine/swarm/ingress.md
View File

@ -15,8 +15,6 @@ menu:
title: Use swarm mode routing mesh
---
{% raw %}
# Use swarm mode routing mesh
Docker Engine swarm mode makes it easy to publish ports for services to make
@ -137,5 +135,3 @@ To learn more about HAProxy, see the [HAProxy documentation](https://cbonte.gith
## Learn more
* [Deploy services to a swarm](services.md)
{% endraw %}

4
engine/swarm/networking.md
View File

@ -13,8 +13,6 @@ menu:
title: Attach services to an overlay network
---
{% raw %}
# Attach services to an overlay network
Docker Engine swarm mode natively supports **overlay networks**, so you can
@ -311,5 +309,3 @@ is not the right tool to confirm VIP connectivity.
* [Swarm administration guide](admin_guide.md)
* [Docker Engine command line reference](../reference/commandline/index.md)
* [Swarm mode tutorial](swarm-tutorial/index.md)
{% endraw %}

4
engine/tutorials/networkingcontainers.md
View File

@ -12,8 +12,6 @@ menu:
title: Network containers
---
{% raw %}
# Network containers
If you are working your way through the user guide, you just built and ran a
@ -263,5 +261,3 @@ The `ping` shows it is contacting a different IP address, the address on the `my
## Next steps
Now that you know how to network containers, see [how to manage data in containers](dockervolumes.md).
{% endraw %}

4
engine/tutorials/usingdocker.md
View File

@ -12,8 +12,6 @@ menu:
title: Run a simple application
---
{% raw %}
# Run a simple application
In the ["*Hello world in a container*"](dockerizing.md) you launched your
@ -322,5 +320,3 @@ Until now you've only used images that you've downloaded from Docker Hub. Next,
you can get introduced to building and sharing our own images.
Go to [Working with Docker Images](dockerimages.md).
{% endraw %}

4
engine/userguide/networking/default_network/dockerlinks.md
View File

@ -10,8 +10,6 @@ menu:
title: Legacy container links
---
{% raw %}
# Legacy container links
The information in this section explains legacy container links within the Docker default bridge. This is a `bridge` network named `bridge` created automatically when you install Docker.
@ -372,5 +370,3 @@ allowing linked communication to continue.
172.17.0.9 db
# Related information
{% endraw %}

4
engine/userguide/networking/work-with-networks.md
View File

@ -9,8 +9,6 @@ menu:
title: Work with network commands
---
{% raw %}
# Work with network commands
This article provides examples of the network subcommands you can use to
@ -928,5 +926,3 @@ f7ab26d71dbd bridge bridge
* [network disconnect](../../reference/commandline/network_disconnect.md)
* [network ls](../../reference/commandline/network_ls.md)
* [network rm](../../reference/commandline/network_rm.md)
{% endraw %}

4
machine/reference/inspect.md
View File

@ -9,8 +9,6 @@ menu:
title: inspect
---
{% raw %}
# inspect
Usage: docker-machine inspect [OPTIONS] [arg...]
@ -89,5 +87,3 @@ While this is usable, it's not very human-readable. For this reason, there is
"SwarmHost": "tcp://0.0.0.0:3376",
"SwarmMaster": false
}
{% endraw %}

4
machine/reference/ls.md
View File

@ -8,8 +8,6 @@ menu:
title: ls
---
{% raw %}
# ls
Usage: docker-machine ls [OPTIONS] [arg...]
@ -108,5 +106,3 @@ To list all machine names with their driver in a table format you can use:
NAME DRIVER
default virtualbox
ec2 amazonec2
{% endraw %}