From 13ebd2c4e4cea2f0f1919eadbb06b8f9ef86da94 Mon Sep 17 00:00:00 2001 From: Traefiker Bot <30906710+traefiker@users.noreply.github.com> Date: Thu, 5 Mar 2020 21:46:04 +0100 Subject: [PATCH] Update version references. --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .semaphoreci/vars | 2 +- .travis.yml | 2 +- docs/content/getting-started/install-traefik.md | 4 ++-- docs/content/getting-started/quick-start.md | 2 +- docs/content/migration/v1-to-v2.md | 6 +++--- docs/content/providers/docker.md | 2 +- docs/content/providers/kubernetes-ingress.md | 2 +- docs/content/routing/providers/kubernetes-crd.md | 2 +- docs/content/user-guides/crd-acme/03-deployments.yml | 2 +- docs/content/user-guides/crd-acme/k3s.yml | 2 +- .../user-guides/docker-compose/acme-dns/docker-compose.yml | 2 +- .../docker-compose/acme-dns/docker-compose_secrets.yml | 2 +- .../user-guides/docker-compose/acme-http/docker-compose.yml | 2 +- .../user-guides/docker-compose/acme-tls/docker-compose.yml | 2 +- .../docker-compose/basic-example/docker-compose.yml | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5c90b5689..8662d2654 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,11 +3,11 @@ PLEASE READ THIS MESSAGE. Documentation fixes or enhancements: - for Traefik v1: use branch v1.7 -- for Traefik v2: use branch v2.1 +- for Traefik v2: use branch v2.2 Bug fixes: - for Traefik v1: use branch v1.7 -- for Traefik v2: use branch v2.1 +- for Traefik v2: use branch v2.2 Enhancements: - for Traefik v1: we only accept bug fixes diff --git a/.semaphoreci/vars b/.semaphoreci/vars index 25c0ccb85..cafb1aac4 100644 --- a/.semaphoreci/vars +++ b/.semaphoreci/vars @@ -10,7 +10,7 @@ else export VERSION='' fi -export CODENAME=cantal +export CODENAME=chevrotin export N_MAKE_JOBS=2 diff --git a/.travis.yml b/.travis.yml index 7632c3de4..4eacc6bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: global: - REPO=$TRAVIS_REPO_SLUG - VERSION=$TRAVIS_TAG - - CODENAME=cantal + - CODENAME=chevrotin - GO111MODULE=on script: diff --git a/docs/content/getting-started/install-traefik.md b/docs/content/getting-started/install-traefik.md index 0e9a206ce..d79d20260 100644 --- a/docs/content/getting-started/install-traefik.md +++ b/docs/content/getting-started/install-traefik.md @@ -9,11 +9,11 @@ You can install Traefik with the following flavors: ## Use the Official Docker Image -Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.1/traefik.sample.toml): +Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.2/traefik.sample.toml): ```bash docker run -d -p 8080:8080 -p 80:80 \ - -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.1 + -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.2 ``` For more details, go to the [Docker provider documentation](../providers/docker.md) diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index cc4fc49a6..b5df1d368 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -15,7 +15,7 @@ version: '3' services: reverse-proxy: # The official v2 Traefik docker image - image: traefik:v2.1 + image: traefik:v2.2 # Enables the web UI and tells Traefik to listen to docker command: --api.insecure=true --providers.docker ports: diff --git a/docs/content/migration/v1-to-v2.md b/docs/content/migration/v1-to-v2.md index c09f9e243..880e2748c 100644 --- a/docs/content/migration/v1-to-v2.md +++ b/docs/content/migration/v1-to-v2.md @@ -104,7 +104,7 @@ Then any router can refer to an instance of the wanted middleware. ```yaml tab="K8s IngressRoute" # The definitions below require the definitions for the Middleware and IngressRoute kinds. - # https://docs.traefik.io/v2.1/reference/dynamic-configuration/kubernetes-crd/#definitions + # https://docs.traefik.io/v2.2/reference/dynamic-configuration/kubernetes-crd/#definitions apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: @@ -275,7 +275,7 @@ Then, a [router's TLS field](../routing/routers/index.md#tls) can refer to one o ```yaml tab="K8s IngressRoute" # The definitions below require the definitions for the TLSOption and IngressRoute kinds. - # https://docs.traefik.io/v2.1/reference/dynamic-configuration/kubernetes-crd/#definitions + # https://docs.traefik.io/v2.2/reference/dynamic-configuration/kubernetes-crd/#definitions apiVersion: traefik.containo.us/v1alpha1 kind: TLSOption metadata: @@ -355,7 +355,7 @@ To apply a redirection, one of the redirect middlewares, [RedirectRegex](../midd ```yaml tab="Docker" # ... traefik: - image: traefik:v2.1 + image: traefik:v2.2 command: - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 5a7e90736..b53ce4129 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -261,7 +261,7 @@ See the sections [Docker API Access](#docker-api-access) and [Docker Swarm API A services: traefik: - image: traefik:v2.1 # The official v2 Traefik docker image + image: traefik:v2.2 # The official v2 Traefik docker image ports: - "80:80" volumes: diff --git a/docs/content/providers/kubernetes-ingress.md b/docs/content/providers/kubernetes-ingress.md index 8dd18a22f..738a474b9 100644 --- a/docs/content/providers/kubernetes-ingress.md +++ b/docs/content/providers/kubernetes-ingress.md @@ -357,7 +357,7 @@ providers: ### Further If one wants to know more about the various aspects of the Ingress spec that Traefik supports, -many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.1/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. +many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.2/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. ## LetsEncrypt Support with the Ingress Provider diff --git a/docs/content/routing/providers/kubernetes-crd.md b/docs/content/routing/providers/kubernetes-crd.md index 04ea73066..dd43b9c70 100644 --- a/docs/content/routing/providers/kubernetes-crd.md +++ b/docs/content/routing/providers/kubernetes-crd.md @@ -43,7 +43,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way. serviceAccountName: traefik-ingress-controller containers: - name: traefik - image: traefik:v2.1 + image: traefik:v2.2 args: - --log.level=DEBUG - --api diff --git a/docs/content/user-guides/crd-acme/03-deployments.yml b/docs/content/user-guides/crd-acme/03-deployments.yml index 0f8912fc3..a168cfcfe 100644 --- a/docs/content/user-guides/crd-acme/03-deployments.yml +++ b/docs/content/user-guides/crd-acme/03-deployments.yml @@ -26,7 +26,7 @@ spec: serviceAccountName: traefik-ingress-controller containers: - name: traefik - image: traefik:v2.1 + image: traefik:v2.2 args: - --api.insecure - --accesslog diff --git a/docs/content/user-guides/crd-acme/k3s.yml b/docs/content/user-guides/crd-acme/k3s.yml index ab16a7115..3d957470f 100644 --- a/docs/content/user-guides/crd-acme/k3s.yml +++ b/docs/content/user-guides/crd-acme/k3s.yml @@ -26,5 +26,5 @@ node: - K3S_CLUSTER_SECRET=somethingtotallyrandom volumes: # this is where you would place a alternative traefik image (saved as a .tar file with - # 'docker save'), if you want to use it, instead of the traefik:v2.1 image. + # 'docker save'), if you want to use it, instead of the traefik:v2.2 image. - /sowewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml index e601f1d05..9ed3dc443 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.1" + image: "traefik:v2.2" container_name: "traefik" command: #- "--log.level=DEBUG" diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml index 358a71d60..8c84ff4e9 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml @@ -13,7 +13,7 @@ secrets: services: traefik: - image: "traefik:v2.1" + image: "traefik:v2.2" container_name: "traefik" command: #- "--log.level=DEBUG" diff --git a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml index 48124f0c7..33db017a3 100644 --- a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.1" + image: "traefik:v2.2" container_name: "traefik" command: #- "--log.level=DEBUG" diff --git a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml index c23ef1f9b..c76f0fd52 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.1" + image: "traefik:v2.2" container_name: "traefik" command: #- "--log.level=DEBUG" diff --git a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml index 4d99992d2..7187dcbef 100644 --- a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.1" + image: "traefik:v2.2" container_name: "traefik" command: #- "--log.level=DEBUG"