From 2a1e46c8b6a1b6aced3e8d6fe2154d621293063e Mon Sep 17 00:00:00 2001 From: mpl Date: Thu, 1 Apr 2021 12:05:03 +0200 Subject: [PATCH 1/3] doc: typo fix --- docs/content/getting-started/configuration-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/getting-started/configuration-overview.md b/docs/content/getting-started/configuration-overview.md index 58ff72e00..51bcb69a3 100644 --- a/docs/content/getting-started/configuration-overview.md +++ b/docs/content/getting-started/configuration-overview.md @@ -35,7 +35,7 @@ Since this configuration is specific to your infrastructure choices, we invite y ## The Static Configuration -There are three different, **mutually exclusive** (e.g. you can use only one at the same time), ways to define static configuration options in Traefik: +There are three different, **mutually exclusive** (i.e. you can use only one at the same time), ways to define static configuration options in Traefik: 1. In a configuration file 1. In the command-line arguments From aa61835b785dde912eefe87704f769ae21a54851 Mon Sep 17 00:00:00 2001 From: Clemens Bergmann Date: Tue, 6 Apr 2021 17:18:03 +0200 Subject: [PATCH 2/3] correct annotation option --- docs/content/routing/providers/kubernetes-ingress.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/routing/providers/kubernetes-ingress.md b/docs/content/routing/providers/kubernetes-ingress.md index ff4542122..ba6e3bd81 100644 --- a/docs/content/routing/providers/kubernetes-ingress.md +++ b/docs/content/routing/providers/kubernetes-ingress.md @@ -761,7 +761,7 @@ There are 3 ways to configure Traefik to use https to communicate with pods: 1. If the service port defined in the ingress spec is `443` (note that you can still use `targetPort` to use a different port on your pod). 1. If the service port defined in the ingress spec has a name that starts with https (such as `https-api`, `https-web` or just `https`). -1. If the ingress spec includes the annotation `traefik.ingress.kubernetes.io/service.serversscheme: https`. +1. If the service spec includes the annotation `traefik.ingress.kubernetes.io/service.serversscheme: https`. If either of those configuration options exist, then the backend communication protocol is assumed to be TLS, and will connect via TLS automatically. From 46d6da4fce6f2c1ff589a70eb991daeded888e69 Mon Sep 17 00:00:00 2001 From: Tom Moulard Date: Tue, 13 Apr 2021 14:02:04 +0200 Subject: [PATCH 3/3] Docs: installing deps for html-proofer Co-authored-by: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com> --- docs/check.Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/check.Dockerfile b/docs/check.Dockerfile index 45bacdbf4..b4df613f1 100644 --- a/docs/check.Dockerfile +++ b/docs/check.Dockerfile @@ -8,8 +8,11 @@ RUN apk --no-cache --no-progress add \ ruby-etc \ ruby-ffi \ ruby-json \ - ruby-nokogiri -RUN gem install html-proofer --version 3.13.0 --no-document -- --use-system-libraries + ruby-nokogiri \ + ruby-dev \ + build-base + +RUN gem install html-proofer --version 3.19.0 --no-document -- --use-system-libraries # After Ruby, some NodeJS YAY! RUN apk --no-cache --no-progress add \