From 730f4b000453146574e88bc8870ec1e1da39d98c Mon Sep 17 00:00:00 2001
From: Tortue Torche <126358-tortuetorche@users.noreply.gitlab.com>
Date: Fri, 3 Sep 2021 15:52:59 +0200
Subject: [PATCH] Use Traefik 2.5 instead of Traefik 2.4 for testing
---
.gitlab-ci.yml | 2 +-
CHANGELOG.md | 1 +
tests/dockerfiles/.env.local | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b222c5..0a9347b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/hub/auto-deploy-image:latest
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
- TRAEFIK_VERSION: "2.4"
+ TRAEFIK_VERSION: "2.5"
PORTAINER_IMAGE: "portainer/portainer-ce"
PORTAINER_VERSION: latest
PORTAINER_COMMAND_OPTIONS: ""
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02f069a..4655bd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use Docker [Compose 1.29.3](https://github.com/docker/compose/releases/tag/1.29.2) instead of Docker [Compose 1.28.3](https://github.com/docker/compose/releases/tag/1.28.3)
- Upgrade Operating System of Docker based images, with [Alpine 3.14](https://hub.docker.com/_/alpine) and [Debian 11](https://hub.docker.com/_/debian)
- Reduce Docker images size
+- Use [Traefik 2.5](https://doc.traefik.io/traefik/v2.5) instead of [Traefik 2.4](https://doc.traefik.io/traefik/v2.4) for testing
### Fixed
- Fix [`rm`](docs/README.md#rm) (remove) action with Portainer CE 2.6
diff --git a/tests/dockerfiles/.env.local b/tests/dockerfiles/.env.local
index d142cdd..92231e9 100644
--- a/tests/dockerfiles/.env.local
+++ b/tests/dockerfiles/.env.local
@@ -43,7 +43,7 @@ PSU_TAG=cfbe17a43cecd1f737cba4584b161ea9676e8adf
PSU_TAG_CORE=core-cfbe17a43cecd1f737cba4584b161ea9676e8adf
PSU_PASSWORD=portainerAdminPassword
-TRAEFIK_VERSION="2.4"
+TRAEFIK_VERSION="2.5"
PORTAINER_IMAGE="portainer/portainer-ce"
#PORTAINER_IMAGE="portainer/portainer"