From d0a09b92ba7e07b78d60f13efe78b2835772c467 Mon Sep 17 00:00:00 2001 From: Florent Poinsaut Date: Fri, 25 Oct 2024 13:48:10 +0000 Subject: [PATCH] Prepare new release --- .cspell.json | 7 +++++++ .devcontainer/devcontainer.json | 3 ++- .gitlab-ci.yml | 10 +++++----- .vscode/extensions.json | 3 ++- .vscode/settings.json | 2 +- CHANGELOG.md | 26 +++++++++++++------------- README.md | 4 ++-- compose.yaml | 8 ++++---- 8 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 .cspell.json diff --git a/.cspell.json b/.cspell.json new file mode 100644 index 0000000..aeddad1 --- /dev/null +++ b/.cspell.json @@ -0,0 +1,7 @@ +{ + "words": [ + "github", + "gitlab", + "traefik" + ] +} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8747a46..1e9659b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -28,10 +28,11 @@ "customizations": { "vscode": { "extensions": [ - "ms-azuretools.vscode-docker", + "mikestead.dotenv", "gitlab.gitlab-workflow", "ymotongpoo.licenser", "davidanson.vscode-markdownlint", + "ms-azuretools.vscode-docker", "redhat.vscode-yaml" ] } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cc0c71..21e7ea2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,22 @@ # Copyright (C) 2024 Solution Libre # -# This file is part of Træfik with Docker Compose. +# This file is part of Traefik with Docker Compose. # -# Træfik with Docker Compose is free software: you can redistribute it and/or modify +# Traefik with Docker Compose is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Træfik with Docker Compose is distributed in the hope that it will be useful, +# Traefik with Docker Compose is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Træfik with Docker Compose. If not, see . +# along with Traefik with Docker Compose. If not, see . include: - - component: $CI_SERVER_FQDN/gitlab/components/lint/markdown@0.2.1 + - component: $CI_SERVER_FQDN/gitlab/components/lint/markdown@0.5.0 inputs: stage: linting - component: usine.solution-libre.fr/gitlab/components/changelog/parse@0.1.2 diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c6903c5..9418057 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,9 +1,10 @@ { "recommendations": [ - "ms-azuretools.vscode-docker", + "mikestead.dotenv", "gitlab.gitlab-workflow", "ymotongpoo.licenser", "davidanson.vscode-markdownlint", + "ms-azuretools.vscode-docker", "redhat.vscode-yaml" ], "unwantedRecommendations": [ diff --git a/.vscode/settings.json b/.vscode/settings.json index daa5219..9485e29 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { - "licenser.projectName": "Træfik with Docker Compose", + "licenser.projectName": "Traefik with Docker Compose", "licenser.license": "GPLv3", } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b812ff..f629dde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,19 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Environment variable `VERSION` to set Træfik version +- Environment variable `VERSION` to set Traefik version - CLI option to enable the Prometheus metrics ### Changed -- Upgrade to [Træfik](https://traefik.io/) [v2.11](https://doc.traefik.io/traefik/v2.11/). +- Upgrade to [Traefik](https://traefik.io/) [v2.11](https://doc.traefik.io/traefik/v2.11/). - Rename the `docker-volumes` file to `volumes` ## [2.1.0] 2023-08-23 ### Changed -- Upgrade to [Træfik](https://traefik.io/) [v2.10](https://doc.traefik.io/traefik/v2.10/). +- Upgrade to [Traefik](https://traefik.io/) [v2.10](https://doc.traefik.io/traefik/v2.10/). - Rename the `docker-compose.yml` file to `compose.yaml` ## [2.0.0] 2022-07-15 @@ -38,7 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Upgrade to [Træfik](https://traefik.io/) [v2.8](https://doc.traefik.io/traefik/v2.8/). +- Upgrade to [Traefik](https://traefik.io/) [v2.8](https://doc.traefik.io/traefik/v2.8/). - Set minimum version of TLS to v1.2. - Move acme.json to a named volume. @@ -67,19 +67,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Upgrade to [Træfik](https://traefik.io/) [v1.7](https://doc.traefik.io/traefik/v1.7/). +- Upgrade to [Traefik](https://traefik.io/) [v1.7](https://doc.traefik.io/traefik/v1.7/). ## [1.0.0] 2018-04-10 ### Added -- [Docker Compose](https://docs.docker.com/compose/) setup for starting [Træfik](https://traefik.io/) +- [Docker Compose](https://docs.docker.com/compose/) setup for starting [Traefik](https://traefik.io/) [v1.6](https://doc.traefik.io/traefik/v1.6/) with [Let's Encrypt](https://letsencrypt.org/). -[2.2.0]: https://github.com/solution-libre/docker-traefik/compare/v2.1.0...v2.2.0 -[2.1.0]: https://github.com/solution-libre/docker-traefik/compare/v2.0.0...v2.1.0 -[2.0.0]: https://github.com/solution-libre/docker-traefik/compare/v1.3.0...v2.0.0 -[1.3.0]: https://github.com/solution-libre/docker-traefik/compare/v1.2.0...v1.3.0 -[1.2.0]: https://github.com/solution-libre/docker-traefik/compare/v1.1.0...v1.2.0 -[1.1.0]: https://github.com/solution-libre/docker-traefik/compare/v1.0.0...v1.1.0 -[1.0.0]: https://github.com/solution-libre/docker-traefik/releases/tag/v1.0.0 +[2.2.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v2.1.0...v2.2.0 +[2.1.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v2.0.0...v2.1.0 +[2.0.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v1.3.0...v2.0.0 +[1.3.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v1.2.0...v1.3.0 +[1.2.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v1.1.0...v1.2.0 +[1.1.0]: https://usine.solution-libre.fr/docker/traefik/-/compare/v1.0.0...v1.1.0 +[1.0.0]: https://usine.solution-libre.fr/docker/traefik/-/releases/v1.0.0 diff --git a/README.md b/README.md index f5b0083..6177dc1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Træfik with Docker Compose +# Traefik with Docker Compose #### Table of Contents @@ -12,7 +12,7 @@ ## Description -[Docker Compose](https://docs.docker.com/compose/) setup for starting [Træfik](https://traefik.io/) +[Docker Compose](https://docs.docker.com/compose/) setup for starting [Traefik](https://traefik.io/) with [Let's Encrypt](https://letsencrypt.org/) by [Solution Libre]. ## Setup diff --git a/compose.yaml b/compose.yaml index 08182b1..d7d0c51 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,19 +1,19 @@ # Copyright (C) 2021-2024 Solution Libre # -# This file is part of Træfik with Docker Compose. +# This file is part of Traefik with Docker Compose. # -# Træfik with Docker Compose is free software: you can redistribute it and/or modify +# Traefik with Docker Compose is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Træfik with Docker Compose is distributed in the hope that it will be useful, +# Traefik with Docker Compose is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Træfik with Docker Compose. If not, see . +# along with Traefik with Docker Compose. If not, see . services: traefik: