Skip to content

Commit

Permalink
Prepare new release
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentPoinsaut committed Oct 25, 2024
1 parent e574e9d commit d0a09b9
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 27 deletions.
7 changes: 7 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"words": [
"github",
"gitlab",
"traefik"
]
}
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Expand Down
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -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 <https://www.gnu.org/licenses/>.
# along with Traefik with Docker Compose. If not, see <https://www.gnu.org/licenses/>.

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
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"licenser.projectName": "Træfik with Docker Compose",
"licenser.projectName": "Traefik with Docker Compose",
"licenser.license": "GPLv3",
}
26 changes: 13 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.

Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Træfik with Docker Compose
# Traefik with Docker Compose

<!-- markdownlint-disable-next-line MD001 -->
#### Table of Contents
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -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 <https://www.gnu.org/licenses/>.
# along with Traefik with Docker Compose. If not, see <https://www.gnu.org/licenses/>.

services:
traefik:
Expand Down

0 comments on commit d0a09b9

Please sign in to comment.