Skip to content
Snippets Groups Projects
Unverified Commit d700e95c authored by kevinpollet's avatar kevinpollet
Browse files

Merge branch v2.11 into v3.0

parents a52c81fd 127c0a75
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,7 @@ Merging a PR requires the following steps to be completed before it is merged au ...@@ -56,7 +56,7 @@ Merging a PR requires the following steps to be completed before it is merged au
* Ensure your PR is not a draft. We do not review drafts, but do answer questions and confer with developers on them as needed. * Ensure your PR is not a draft. We do not review drafts, but do answer questions and confer with developers on them as needed.
* Pass the validation check. * Pass the validation check.
* Pass all tests. * Pass all tests.
* Receive 3 approving reviews from maintainers. * Receive 2 approving reviews from maintainers.
## Pull Request Review Cycle ## Pull Request Review Cycle
...@@ -112,7 +112,7 @@ In such a situation, solve the conflicts/CI/... and then remove the label `bot/n ...@@ -112,7 +112,7 @@ In such a situation, solve the conflicts/CI/... and then remove the label `bot/n
To prevent the bot from automatically merging a PR, add the label `bot/no-merge`. To prevent the bot from automatically merging a PR, add the label `bot/no-merge`.
The label `bot/light-review` decreases the number of required LGTM from 3 to 1. The label `bot/light-review` decreases the number of required LGTM from 2 to 1.
This label can be used when: This label can be used when:
......
...@@ -12,6 +12,14 @@ A Story of Tags, Services & Instances ...@@ -12,6 +12,14 @@ A Story of Tags, Services & Instances
Attach tags to your services and let Traefik do the rest! Attach tags to your services and let Traefik do the rest!
One of the best feature of Traefik is to delegate the routing configuration to the application level.
With Consul Catalog, Traefik can leverage tags attached to a service to generate routing rules.
!!! warning "Tags & sensitive data"
We recommend to *not* use tags to store sensitive data (certificates, credentials, etc).
Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc).
## Routing Configuration ## Routing Configuration
!!! info "tags" !!! info "tags"
......
...@@ -12,6 +12,14 @@ A Story of Labels & Containers ...@@ -12,6 +12,14 @@ A Story of Labels & Containers
Attach labels to your containers and let Traefik do the rest! Attach labels to your containers and let Traefik do the rest!
One of the best feature of Traefik is to delegate the routing configuration to the application level.
With Docker, Traefik can leverage labels attached to a container to generate routing rules.
!!! warning "Labels & sensitive data"
We recommend to *not* use labels to store sensitive data (certificates, credentials, etc).
Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc).
## Configuration Examples ## Configuration Examples
??? example "Configuring Docker & Deploying / Exposing Services" ??? example "Configuring Docker & Deploying / Exposing Services"
......
...@@ -10,6 +10,14 @@ A Story of Labels & Elastic Containers ...@@ -10,6 +10,14 @@ A Story of Labels & Elastic Containers
Attach labels to your containers and let Traefik do the rest! Attach labels to your containers and let Traefik do the rest!
One of the best feature of Traefik is to delegate the routing configuration to the application level.
With ECS, Traefik can leverage labels attached to a container to generate routing rules.
!!! warning "Labels & sensitive data"
We recommend to *not* use labels to store sensitive data (certificates, credentials, etc).
Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc).
## Routing Configuration ## Routing Configuration
!!! info "labels" !!! info "labels"
......
...@@ -12,6 +12,14 @@ A story of Tags, Services & Nomads ...@@ -12,6 +12,14 @@ A story of Tags, Services & Nomads
Attach tags to your Nomad services and let Traefik do the rest! Attach tags to your Nomad services and let Traefik do the rest!
One of the best feature of Traefik is to delegate the routing configuration to the application level.
With Nomad, Traefik can leverage tags attached to a service to generate routing rules.
!!! warning "Tags & sensitive data"
We recommend to *not* use tags to store sensitive data (certificates, credentials, etc).
Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc).
## Routing Configuration ## Routing Configuration
!!! info "tags" !!! info "tags"
......
...@@ -12,6 +12,14 @@ A Story of Labels & Containers ...@@ -12,6 +12,14 @@ A Story of Labels & Containers
Attach labels to your containers and let Traefik do the rest! Attach labels to your containers and let Traefik do the rest!
One of the best feature of Traefik is to delegate the routing configuration to the application level.
With Docker Swarm, Traefik can leverage labels attached to a service to generate routing rules.
!!! warning "Labels & sensitive data"
We recommend to *not* use labels to store sensitive data (certificates, credentials, etc).
Instead, we recommend to store sensitive data in a safer storage (secrets, file, etc).
## Configuration Examples ## Configuration Examples
??? example "Configuring Docker Swarm & Deploying / Exposing Services" ??? example "Configuring Docker Swarm & Deploying / Exposing Services"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment