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

Merge branch v2.11 into v3.3

Browse source
This commit is contained in:
romain 2025-01-31 15:20:12 +01:00
commit cfebed7328
7 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -1,3 +1,12 @@
## [v2.11.20](https://github.com/traefik/traefik/tree/v2.11.20) (2025-01-31)
[All Commits](https://github.com/traefik/traefik/compare/v2.11.19...v2.11.20)
**Bug fixes:**
- **[acme]** Graceful shutdown for ACME JSON write operation ([#11497](https://github.com/traefik/traefik/pull/11497) by [juliens](https://github.com/juliens))
**Documentation:**
- Change docker-compose to docker compose ([#11496](https://github.com/traefik/traefik/pull/11496) by [khai-pi](https://github.com/khai-pi))
## [v2.11.19](https://github.com/traefik/traefik/tree/v2.11.19) (2025-01-29) ## [v2.11.19](https://github.com/traefik/traefik/tree/v2.11.19) (2025-01-29)
[All Commits](https://github.com/traefik/traefik/compare/v2.11.18...v2.11.19) [All Commits](https://github.com/traefik/traefik/compare/v2.11.18...v2.11.19)

6
docs/content/getting-started/quick-start.md
View file

@ -38,7 +38,7 @@ services:
Start your `reverse-proxy` with the following command: Start your `reverse-proxy` with the following command:
```shell ```shell
docker-compose up -d reverse-proxy docker compose up -d reverse-proxy
``` ```
You can open a browser and go to `http://localhost:8080/api/rawdata` to see Traefik's API rawdata (you'll go back there once you have launched a service in step 2). You can open a browser and go to `http://localhost:8080/api/rawdata` to see Traefik's API rawdata (you'll go back there once you have launched a service in step 2).
@ -68,7 +68,7 @@ The above defines `whoami`: a web service that outputs information about the mac
Start the `whoami` service with the following command: Start the `whoami` service with the following command:
```shell ```shell
docker-compose up -d whoami docker compose up -d whoami
``` ```
Browse `http://localhost:8080/api/rawdata` and see that Traefik has automatically detected the new container and updated its own configuration. Browse `http://localhost:8080/api/rawdata` and see that Traefik has automatically detected the new container and updated its own configuration.
@ -92,7 +92,7 @@ IP: 172.27.0.3
Run more instances of your `whoami` service with the following command: Run more instances of your `whoami` service with the following command:
```shell ```shell
docker-compose up -d --scale whoami=2 docker compose up -d --scale whoami=2
``` ```
Browse to `http://localhost:8080/api/rawdata` and see that Traefik has automatically detected the new instance of the container. Browse to `http://localhost:8080/api/rawdata` and see that Traefik has automatically detected the new instance of the container.

2
docs/content/user-guides/crd-acme/index.md
View file

@ -31,7 +31,7 @@ Our starting point is the docker-compose configuration file, to start the k3s cl
You can start it with: You can start it with:
```bash ```bash
docker-compose -f k3s.yml up docker compose -f k3s.yml up
``` ```
```yaml ```yaml

2
docs/content/user-guides/docker-compose/acme-dns/index.md
View file

@ -46,7 +46,7 @@ For the DNS challenge, you'll need:
#- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
``` ```
- Run `docker-compose up -d` within the folder where you created the previous file. - Run `docker compose up -d` within the folder where you created the previous file.
- Wait a bit and visit `https://your_own_domain` to confirm everything went fine. - Wait a bit and visit `https://your_own_domain` to confirm everything went fine.
!!! Note !!! Note

2
docs/content/user-guides/docker-compose/acme-http/index.md
View file

@ -32,7 +32,7 @@ For the HTTP challenge you will need:
#- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
``` ```
- Run `docker-compose up -d` within the folder where you created the previous file. - Run `docker compose up -d` within the folder where you created the previous file.
- Wait a bit and visit `https://your_own_domain` to confirm everything went fine. - Wait a bit and visit `https://your_own_domain` to confirm everything went fine.
!!! Note !!! Note

2
docs/content/user-guides/docker-compose/acme-tls/index.md
View file

@ -32,7 +32,7 @@ For the TLS challenge you will need:
#- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
``` ```
- Run `docker-compose up -d` within the folder where you created the previous file. - Run `docker compose up -d` within the folder where you created the previous file.
- Wait a bit and visit `https://your_own_domain` to confirm everything went fine. - Wait a bit and visit `https://your_own_domain` to confirm everything went fine.
!!! Note !!! Note

2
docs/content/user-guides/docker-compose/basic-example/index.md
View file

@ -46,7 +46,7 @@ Create a `docker-compose.yml` file with the following content:
Replace `whoami.localhost` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service. Replace `whoami.localhost` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service.
Now run `docker-compose up -d` within the folder where you created the previous file. Now run `docker compose up -d` within the folder where you created the previous file.
This will start Docker Compose in background mode. This will start Docker Compose in background mode.
!!! info "This can take a moment" !!! info "This can take a moment"