From 8f5dd7bd9df7d467f3d3578826b557c12bd94786 Mon Sep 17 00:00:00 2001 From: khai-pi <83369230+khai-pi@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:30:05 +0100 Subject: [PATCH 1/2] Change docker-compose to docker compose --- docs/content/getting-started/quick-start.md | 6 +++--- docs/content/user-guides/crd-acme/index.md | 2 +- docs/content/user-guides/docker-compose/acme-dns/index.md | 2 +- docs/content/user-guides/docker-compose/acme-http/index.md | 2 +- docs/content/user-guides/docker-compose/acme-tls/index.md | 2 +- .../user-guides/docker-compose/basic-example/index.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index cdae1c45c..90db5a165 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -38,7 +38,7 @@ services: Start your `reverse-proxy` with the following command: ```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). @@ -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: ```shell -docker-compose up -d whoami +docker compose up -d whoami ``` Go back to your browser (`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: ```shell -docker-compose up -d --scale whoami=2 +docker compose up -d --scale whoami=2 ``` Go back to your browser (`http://localhost:8080/api/rawdata`) and see that Traefik has automatically detected the new instance of the container. diff --git a/docs/content/user-guides/crd-acme/index.md b/docs/content/user-guides/crd-acme/index.md index c291675f7..72d0e3344 100644 --- a/docs/content/user-guides/crd-acme/index.md +++ b/docs/content/user-guides/crd-acme/index.md @@ -31,7 +31,7 @@ Our starting point is the docker-compose configuration file, to start the k3s cl You can start it with: ```bash -docker-compose -f k3s.yml up +docker compose -f k3s.yml up ``` ```yaml diff --git a/docs/content/user-guides/docker-compose/acme-dns/index.md b/docs/content/user-guides/docker-compose/acme-dns/index.md index 57752f855..e626c633a 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/index.md +++ b/docs/content/user-guides/docker-compose/acme-dns/index.md @@ -46,7 +46,7 @@ For the DNS challenge, you'll need: #- "--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. !!! Note diff --git a/docs/content/user-guides/docker-compose/acme-http/index.md b/docs/content/user-guides/docker-compose/acme-http/index.md index b53c2ac45..c4a29a33b 100644 --- a/docs/content/user-guides/docker-compose/acme-http/index.md +++ b/docs/content/user-guides/docker-compose/acme-http/index.md @@ -32,7 +32,7 @@ For the HTTP challenge you will need: #- "--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. !!! Note diff --git a/docs/content/user-guides/docker-compose/acme-tls/index.md b/docs/content/user-guides/docker-compose/acme-tls/index.md index cb1a40e49..382244c62 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/index.md +++ b/docs/content/user-guides/docker-compose/acme-tls/index.md @@ -32,7 +32,7 @@ For the TLS challenge you will need: #- "--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. !!! Note diff --git a/docs/content/user-guides/docker-compose/basic-example/index.md b/docs/content/user-guides/docker-compose/basic-example/index.md index c3950dd1d..4b5e33cd5 100644 --- a/docs/content/user-guides/docker-compose/basic-example/index.md +++ b/docs/content/user-guides/docker-compose/basic-example/index.md @@ -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. -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. !!! info "This can take a moment" From 4e441d09edd3a4b75051c307e07de47943ba1fd1 Mon Sep 17 00:00:00 2001 From: Romain Date: Fri, 31 Jan 2025 15:16:04 +0100 Subject: [PATCH 2/2] Prepare release v2.11.20 --- CHANGELOG.md | 9 +++++++++ script/gcg/traefik-bugfix.toml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f959a89ac..f5d39ff06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) [All Commits](https://github.com/traefik/traefik/compare/v2.11.18...v2.11.19) diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml index 43ada85bd..77ae402b1 100644 --- a/script/gcg/traefik-bugfix.toml +++ b/script/gcg/traefik-bugfix.toml @@ -4,11 +4,11 @@ RepositoryName = "traefik" OutputType = "file" FileName = "traefik_changelog.md" -# example new bugfix v2.11.19 +# example new bugfix v2.11.20 CurrentRef = "v2.11" -PreviousRef = "v2.11.18" +PreviousRef = "v2.11.19" BaseBranch = "v2.11" -FutureCurrentRefName = "v2.11.19" +FutureCurrentRefName = "v2.11.20" ThresholdPreviousRef = 10 ThresholdCurrentRef = 10