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

docker-compose examples #4642

Merged
merged 3 commits into from
Mar 22, 2019
Merged

docker-compose examples #4642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bf8410
Revisions to examples of docker-compose settings
karnthis Mar 21, 2019
b406281
Rename of Configuration Overview page
karnthis Mar 21, 2019
a18ebde
review: rename file.
ldez Mar 22, 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: 1 addition & 1 deletion docs/content/getting-started/configuration-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration Overview
# Configuration Introduction

How the Magic Happens
{: .subtitle }
Expand Down
2 changes: 1 addition & 1 deletion docs/content/getting-started/quick-start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version: '3'

services:
reverse-proxy:
image: traefik # The official Traefik docker image
image: traefik:v2.0 # The official v2.0 Traefik docker image
command: --api --providers.docker # Enables the web UI and tells Traefik to listen to docker
ports:
- "80:80" # The HTTP port
Expand Down
2 changes: 1 addition & 1 deletion docs/content/providers/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Traefik requires access to the docker socket to get its dynamic configuration.
services:

traefik:
image: traefik
image: traefik:v2.0 # The official v2.0 Traefik docker image
ports:
- "80:80"
volumes:
Expand Down
4 changes: 2 additions & 2 deletions docs/content/routing/entrypoints.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Entrypoints are part of the [static configuration](../getting-started/configurat

```yaml
traefik:
image: traefik
image: traefik:v2.0 # The official v2.0 Traefik docker image
command:
- --defaultentrypoints=powpow
- "--entryPoints=Name:powpow Address::42 Compress:true"
Expand All @@ -74,7 +74,7 @@ Entrypoints are part of the [static configuration](../getting-started/configurat

```yaml
traefik:
image: traefik
image: traefik:v2.0 # The official v2.0 Traefik docker image
command: --defaultentrypoints=powpow --entryPoints='Name:powpow Address::42 Compress:true'
```

Expand Down
2 changes: 1 addition & 1 deletion docs/mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ nav:
- 'Getting Started':
- 'Concepts' : 'getting-started/concepts.md'
- 'Quick Start': 'getting-started/quick-start.md'
- 'Configuration Overview': 'getting-started/configuration-overview.md'
- 'Configuration Introduction': 'getting-started/configuration-overview.md'
- 'Configuration Discovery':
- 'Overview': 'providers/overview.md'
- 'Docker': 'providers/docker.md'
Expand Down