baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Improve the wording in the documentation for Docker and fix title for Docker User Guide

Browse source
This commit is contained in:
Damien Duportal 2018-08-20 16:46:04 +02:00 committed by Traefiker Bot
parent 870755e90d
commit e46de74328
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/configuration/backends/docker.md
View file

@ -19,7 +19,7 @@ Træfik can be configured to use Docker as a provider.
# #
endpoint = "unix:///var/run/docker.sock" endpoint = "unix:///var/run/docker.sock"
# Default domain used. # Default base domain used for the frontend rules.
# Can be overridden by setting the "traefik.domain" label on a container. # Can be overridden by setting the "traefik.domain" label on a container.
# #
# Required # Required
@ -110,7 +110,7 @@ To enable constraints see [provider-specific constraints section](/configuration
# #
endpoint = "tcp://127.0.0.1:2375" endpoint = "tcp://127.0.0.1:2375"
# Default domain used. # Default base domain used for the frontend rules.
# Can be overridden by setting the "traefik.domain" label on a services. # Can be overridden by setting the "traefik.domain" label on a services.
# #
# Optional # Optional
@ -210,7 +210,7 @@ Labels can be used on containers to override default behavior.
| Label | Description | | Label | Description |
|------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `traefik.docker.network` | Overrides the default docker network to use for connections to the container. [1] | | `traefik.docker.network` | Overrides the default docker network to use for connections to the container. [1] |
| `traefik.domain` | Sets the default domain for the frontend rules. | | `traefik.domain` | Sets the default base domain for the frontend rules. For more information, check the [Container Labels section's of the user guide "Let's Encrypt & Docker"](/user-guide/docker-and-lets-encrypt/#container-labels) |
| `traefik.enable=false` | Disables this container in Træfik. | | `traefik.enable=false` | Disables this container in Træfik. |
| `traefik.port=80` | Registers this port. Useful when the container exposes multiples ports. | | `traefik.port=80` | Registers this port. Useful when the container exposes multiples ports. |
| `traefik.protocol=https` | Overrides the default `http` protocol | | `traefik.protocol=https` | Overrides the default `http` protocol |

2
docs/user-guide/docker-and-lets-encrypt.md
View file

@ -1,4 +1,4 @@
# Docker & Traefik # Let's Encrypt & Docker
In this use case, we want to use Træfik as a _layer-7_ load balancer with SSL termination for a set of micro-services used to run a web application. In this use case, we want to use Træfik as a _layer-7_ load balancer with SSL termination for a set of micro-services used to run a web application.