From c2d88259d108c0956970069f3ac6719fbd810e04 Mon Sep 17 00:00:00 2001 From: korridor <26689068+korridor@users.noreply.github.com> Date: Tue, 28 May 2024 16:09:26 +0200 Subject: [PATCH] Updated traefik to 2.11.3; Removed legacy docker compose version and docker-compose command --- .github/dependabot.yml | 14 +++++++------- docker-compose.local.yml | 3 +-- docker-compose.prod.yml | 3 +-- readme.md | 21 +++++++++++---------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a9634cc..14125dc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,11 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - version: 2 updates: - - package-ecosystem: "docker" # See documentation for possible values - directory: "/" # Location of package manifests + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + target-branch: "main" + - package-ecosystem: "docker" + directory: "/" schedule: interval: "daily" diff --git a/docker-compose.local.yml b/docker-compose.local.yml index e6a20b7..ae3d63e 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -1,4 +1,3 @@ -version: '3.8' networks: routing: ipam: @@ -7,7 +6,7 @@ networks: - subnet: 10.100.100.0/24 services: traefik: - image: traefik:2.11.0 + image: traefik:2.11.3 restart: always container_name: reverse_proxy_traefik ports: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 0f0d246..353615e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,10 +1,9 @@ -version: '3.8' networks: routing: driver: bridge services: traefik: - image: traefik:2.11.0 + image: traefik:2.11.3 restart: always container_name: reverse_proxy_traefik ports: diff --git a/readme.md b/readme.md index 381d787..632f914 100644 --- a/readme.md +++ b/readme.md @@ -17,16 +17,17 @@ It uses: - [Production setup](#production-setup) - [Setting up traefik](#setting-up-traefik) - [Traefik dashboard](#traefik-dashboard) - - [Connect docker-compose service to reverse-proxy](#connect-docker-compose-service-to-reverse-proxy) + - [Connect docker compose service to reverse-proxy](#connect-docker-compose-service-to-reverse-proxy) - [SSL configuration](#ssl-configuration) - [Global middlewares](#global-middlewares) - [Access Logs](#access-logs) - [Setup for local development](#setup-for-local-development) - [Setting up traefik](#setting-up-traefik-1) - [Traefik dashboard](#traefik-dashboard-1) - - [Connect docker-compose service to reverse-proxy](#connect-docker-compose-service-to-reverse-proxy-1) + - [Connect docker compose service to reverse-proxy](#connect-docker-compose-service-to-reverse-proxy-1) - [Enable SSL locally](#enable-ssl-locally) - - [Enable SSL in the docker-compose file](#enable-ssl-in-the-docker-compose-file) + - [Enable SSL in the docker compose file](#enable-ssl-in-the-docker-compose-file) + - [FAQ](#faq) - [Credits](#credits) - [License](#license) @@ -79,11 +80,11 @@ It uses: ``` 6. Start container ```bash - docker-compose up -d + docker compose up -d ``` 7. Check that traefik is running smoothly ```bash - docker-compose logs + docker compose logs ``` ### Traefik dashboard @@ -94,7 +95,7 @@ https://reverse-proxy.somedomain.com ``` The dashboard shows you the configured routers, services, middleware, etc. -### Connect docker-compose service to reverse-proxy +### Connect docker compose service to reverse-proxy ```yaml version: '3.8' @@ -235,11 +236,11 @@ accessLog: {} ``` 4. Start container ```bash - docker-compose up -d + docker compose up -d ``` 5. Check that traefik is running smoothly ```bash - docker-compose logs + docker compose logs ``` ### Traefik dashboard @@ -250,7 +251,7 @@ http://reverse-proxy.test ``` The dashboard shows you the configured routers, services, middlewares, etc. -### Connect docker-compose service to reverse-proxy +### Connect docker compose service to reverse-proxy ```yaml version: '3.8' @@ -323,7 +324,7 @@ cd certificates mkcert -key-file local.key.pem -cert-file local.cert.pem "*.local" "*.test" "*.someservice.test" "*.someservice.local" ``` -### Enable SSL in the docker-compose file +### Enable SSL in the docker compose file ```yaml version: '3.8'