From 119d0134e0917c3a4d951bbcd94aacc8875029eb Mon Sep 17 00:00:00 2001 From: Erin Date: Fri, 22 Mar 2019 09:22:09 -0500 Subject: [PATCH] Documentation Updates: docker-compose examples --- docs/content/getting-started/configuration-overview.md | 2 +- docs/content/getting-started/quick-start.md | 2 +- docs/content/providers/docker.md | 2 +- docs/content/routing/entrypoints.md | 4 ++-- docs/mkdocs.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/content/getting-started/configuration-overview.md b/docs/content/getting-started/configuration-overview.md index b24e97568..3ae0915e0 100644 --- a/docs/content/getting-started/configuration-overview.md +++ b/docs/content/getting-started/configuration-overview.md @@ -1,4 +1,4 @@ -# Configuration Overview +# Configuration Introduction How the Magic Happens {: .subtitle } diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index 30582a855..dd18019b4 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -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 diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 66eb792ac..3af842665 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -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: diff --git a/docs/content/routing/entrypoints.md b/docs/content/routing/entrypoints.md index d043a83b3..3ef4680b4 100644 --- a/docs/content/routing/entrypoints.md +++ b/docs/content/routing/entrypoints.md @@ -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" @@ -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' ``` diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 32724e1d5..6de0d6d04 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -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'