Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dynamic Configuration Reference for both Docker and Marathon #5100

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Update Dynamic Configuration Reference for both Docker and Marathon #5100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b255c
fix: Dynamic Configuration Reference for Docker
jbdoumenjou Jul 15, 2019
1949cd1
fix: Dynamic Configuration Reference for Marathon
jbdoumenjou Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/content/reference/dynamic-configuration/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ Dynamic configuration with Docker Labels
The labels are case insensitive.

```yaml
labels:
--8<-- "content/reference/dynamic-configuration/docker.yml"
--8<-- "content/reference/dynamic-configuration/labels.yml"
```
3 changes: 3 additions & 0 deletions docs/content/reference/dynamic-configuration/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- "traefik.enable=true"
- "traefik.docker.network=foobar"
- "traefik.docker.lbswarm=true"
329 changes: 164 additions & 165 deletions docs/content/reference/dynamic-configuration/labels.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/content/reference/dynamic-configuration/marathon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ Dynamic configuration with Marathon Labels
{: .subtitle }

```yaml
labels:
--8<-- "content/reference/dynamic-configuration/marathon.yml"
--8<-- "content/reference/dynamic-configuration/labels.yml"
```
2 changes: 2 additions & 0 deletions docs/content/reference/dynamic-configuration/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- "traefik.enable=true"
- "traefik.marathon.ipaddressidx=42"
1 change: 1 addition & 0 deletions docs/mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,6 @@ nav:
- 'Environment variables': 'reference/static-configuration/env.md'
- 'Dynamic Configuration':
- 'Docker': 'reference/dynamic-configuration/docker.md'
- 'Marathon': 'reference/dynamic-configuration/marathon.md'
- 'Kubernetes CRD': 'reference/dynamic-configuration/kubernetes-crd.md'
- 'File': 'reference/dynamic-configuration/file.md'