Skip to content

Commit

Permalink
Sync vnext-engine branch to docker/docker SHA 2f12d28
Browse files Browse the repository at this point in the history
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
  • Loading branch information
Misty Stanley-Jones committed Oct 10, 2016
1 parent 4a833da commit e4bce35
Show file tree
Hide file tree
Showing 270 changed files with 5,085 additions and 3,984 deletions.
24 changes: 11 additions & 13 deletions engine/admin/ambassador_pattern_linking.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
---
aliases:
- /engine/articles/ambassador_pattern_linking/
description: Using the Ambassador pattern to abstract (network) services
keywords:
- Examples, Usage, links, docker, documentation, examples, names, name, container
naming
menu:
main:
parent: engine_admin
weight: 15
title: Link via an ambassador container
---
<!--[metadata]>
+++
aliases = ["/engine/articles/ambassador_pattern_linking/"]
title = "Link via an ambassador container"
description = "Using the Ambassador pattern to abstract (network) services"
keywords = ["Examples, Usage, links, docker, documentation, examples, names, name, container naming"]
[menu.main]
parent = "engine_admin"
weight = 15
+++
<![end-metadata]-->

# Link via an ambassador container

Expand Down
24 changes: 12 additions & 12 deletions engine/admin/b2d_volume_resize.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
description: Resizing a Boot2Docker volume in VirtualBox with GParted
draft: "true"
keywords:
- boot2docker, volume, virtualbox
menu:
main:
parent: smn_win_osx
title: "Resizing a Boot2Docker volume\t"
---

# Getting no space left on device errors with Boot2Docker?
<!--[metadata]>
+++
draft = "true"
title = "Resizing a Boot2Docker volume "
description = "Resizing a Boot2Docker volume in VirtualBox with GParted"
keywords = ["boot2docker, volume, virtualbox"]
[menu.main]
parent = "smn_win_osx"
+++
<![end-metadata]-->

# Getting "no space left on device" errors with Boot2Docker?

If you're using Boot2Docker with a large number of images, or the images you're
working with are very large, your pulls might start failing with "no space left
Expand Down
23 changes: 11 additions & 12 deletions engine/admin/chef.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---
aliases:
- /engine/articles/chef/
description: Installation and using Docker via Chef
keywords:
- chef, installation, usage, docker, documentation
menu:
main:
parent: engine_admin
weight: "11"
title: Using Chef
---
<!--[metadata]>
+++
aliases = ["/engine/articles/chef/"]
title = "Using Chef"
description = "Installation and using Docker via Chef"
keywords = ["chef, installation, usage, docker, documentation"]
[menu.main]
parent = "engine_admin"
weight="11"
+++
<![end-metadata]-->

# Using Chef

Expand Down
23 changes: 11 additions & 12 deletions engine/admin/dsc.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---
aliases:
- /engine/articles/dsc/
description: Using DSC to configure a new Docker host
keywords:
- powershell, dsc, installation, usage, docker, documentation
menu:
main:
parent: engine_admin
weight: "10"
title: PowerShell DSC Usage
---
<!--[metadata]>
+++
aliases = ["/engine/articles/dsc/"]
title = "PowerShell DSC Usage"
description = "Using DSC to configure a new Docker host"
keywords = ["powershell, dsc, installation, usage, docker, documentation"]
[menu.main]
parent = "engine_admin"
weight="10"
+++
<![end-metadata]-->

# Using PowerShell DSC

Expand Down
35 changes: 12 additions & 23 deletions engine/admin/formatting.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
description: CLI and log output formatting reference
keywords:
- format, formatting, output, templates, log
menu:
main:
parent: engine_admin
weight: 7
title: Format command and log output
---
<!--[metadata]>
+++
title = "Format command and log output"
description = "CLI and log output formatting reference"
keywords = ["format, formatting, output, templates, log"]
[menu.main]
parent = "engine_admin"
weight=7
+++
<![end-metadata]-->

# Formatting reference

Expand All @@ -20,6 +20,7 @@ list of elements they support in their templates:
- [Docker Log Tag formatting](logging/log_tags.md)
- [Docker Network Inspect formatting](../reference/commandline/network_inspect.md)
- [Docker PS formatting](../reference/commandline/ps.md#formatting)
- [Docker Stats formatting](../reference/commandline/stats.md#formatting)
- [Docker Volume Inspect formatting](../reference/commandline/volume_inspect.md)
- [Docker Version formatting](../reference/commandline/version.md#examples)

Expand All @@ -33,46 +34,34 @@ This is the complete list of the available functions with examples:
Join concatenates a list of strings to create a single string.
It puts a separator between each element in the list.

{% raw %}
$ docker ps --format '{{join .Names " or "}}'
{% endraw %}

### Json

Json encodes an element as a json string.

{% raw %}
$ docker inspect --format '{{json .Mounts}}' container
{% endraw %}

### Lower

Lower turns a string into its lower case representation.

{% raw %}
$ docker inspect --format "{{lower .Name}}" container
{% endraw %}

### Split

Split slices a string into a list of strings separated by a separator.

{% raw %}
# docker inspect --format '{{split (join .Names "/") "/"}}' container
{% endraw %}

### Title

Title capitalizes a string.

{% raw %}
$ docker inspect --format "{{title .Name}}" container
{% endraw %}

### Upper

Upper turns a string into its upper case representation.
Upper turms a string into its upper case representation.

{% raw %}
$ docker inspect --format "{{upper .Name}}" container
{% endraw %}
23 changes: 11 additions & 12 deletions engine/admin/host_integration.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
---
aliases:
- /engine/articles/host_integration/
description: How to generate scripts for upstart, systemd, etc.
keywords:
- systemd, upstart, supervisor, docker, documentation, host integration
menu:
main:
parent: engine_admin
weight: "5"
title: Automatically start containers
---
<!--[metadata]>
+++
aliases = ["/engine/articles/host_integration/"]
title = "Automatically start containers"
description = "How to generate scripts for upstart, systemd, etc."
keywords = ["systemd, upstart, supervisor, docker, documentation, host integration"]
[menu.main]
parent = "engine_admin"
weight="5"
+++
<![end-metadata]-->

# Automatically start containers

Expand Down
27 changes: 14 additions & 13 deletions engine/admin/index.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
---
aliases:
- /engine/articles/configuring/
- /engine/admin/configuring/
description: Configuring and running the Docker daemon on various distributions
keywords:
- docker, daemon, configuration, running, process managers
menu:
main:
parent: engine_admin
weight: 0
title: Configuring and running Docker
---
<!--[metadata]>
+++
aliases = [
"/engine/articles/configuring/",
"/engine/admin/configuring/"
]
title = "Configuring and running Docker"
description = "Configuring and running the Docker daemon on various distributions"
keywords = ["docker, daemon, configuration, running, process managers"]
[menu.main]
parent = "engine_admin"
weight = 0
+++
<![end-metadata]-->

# Configuring and running Docker on various distributions

Expand Down
20 changes: 10 additions & 10 deletions engine/admin/live-restore.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
description: How to keep containers running when the daemon isn't available.
keywords:
- docker, upgrade, daemon, dockerd, live-restore, daemonless container
menu:
main:
parent: engine_admin
weight: "6"
title: Keep containers alive during daemon downtime
---
<!--[metadata]>
+++
title = "Keep containers alive during daemon downtime"
description = "How to keep containers running when the daemon isn't available."
keywords = ["docker, upgrade, daemon, dockerd, live-restore, daemonless container"]
[menu.main]
parent = "engine_admin"
weight="6"
+++
<![end-metadata]-->

# Keep containers alive during daemon downtime

Expand Down
21 changes: 10 additions & 11 deletions engine/admin/logging/awslogs.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
aliases:
- /engine/reference/logging/awslogs/
description: Describes how to use the Amazon CloudWatch Logs logging driver.
keywords:
- AWS, Amazon, CloudWatch, logging, driver
menu:
main:
parent: smn_logging
title: Amazon CloudWatch Logs logging driver
---
<!--[metadata]>
+++
aliases = ["/engine/reference/logging/awslogs/"]
title = "Amazon CloudWatch Logs logging driver"
description = "Describes how to use the Amazon CloudWatch Logs logging driver."
keywords = ["AWS, Amazon, CloudWatch, logging, driver"]
[menu.main]
parent = "smn_logging"
+++
<![end-metadata]-->

# Amazon CloudWatch Logs logging driver

Expand Down
19 changes: 10 additions & 9 deletions engine/admin/logging/etwlogs.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---
description: Describes how to use the etwlogs logging driver.
keywords:
- ETW, docker, logging, driver
menu:
main:
parent: smn_logging
title: ETW logging driver
---
<!--[metadata]>
+++
title = "ETW logging driver"
description = "Describes how to use the etwlogs logging driver."
keywords = ["ETW, docker, logging, driver"]
[menu.main]
parent = "smn_logging"
+++
<![end-metadata]-->


# ETW logging driver

Expand Down
23 changes: 10 additions & 13 deletions engine/admin/logging/fluentd.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
aliases:
- /engine/reference/logging/fluentd/
description: Describes how to use the fluentd logging driver.
keywords:
- Fluentd, docker, logging, driver
menu:
main:
parent: smn_logging
title: Fluentd logging driver
---
<!--[metadata]>
+++
aliases = ["/engine/reference/logging/fluentd/"]
title = "Fluentd logging driver"
description = "Describes how to use the fluentd logging driver."
keywords = ["Fluentd, docker, logging, driver"]
[menu.main]
parent = "smn_logging"
+++
<![end-metadata]-->

# Fluentd logging driver

Expand All @@ -33,10 +32,8 @@ The `docker logs` command is not available for this logging driver.

Some options are supported by specifying `--log-opt` as many times as needed:

{% raw %}
- `fluentd-address`: specify `host:port` to connect `localhost:24224`
- `tag`: specify tag for fluentd message, which interpret some markup, ex `{{.ID}}`, `{{.FullID}}` or `{{.Name}}` `docker.{{.ID}}`
{% endraw %}


Configure the default logging driver by passing the
Expand Down
Loading

0 comments on commit e4bce35

Please sign in to comment.