From abae7ee0289e98dfe74be1c82a901a8a02305c8b Mon Sep 17 00:00:00 2001 From: maxlerebourg Date: Mon, 17 Apr 2023 09:25:57 +0200 Subject: [PATCH] :memo: update version used (#97) * :memo: update version used * :memo: update doc * :memo: documentation * :memo: documentation * :memo: versionning --- README.md | 1 + docker-compose.local.yml | 4 ++-- docker-compose.yml | 6 +++--- exemples/behind-proxy/docker-compose.cloudflare.yml | 13 ++++++------- exemples/binary-vm/scripts/install_traefik.sh | 2 +- exemples/binary-vm/scripts/install_whoami.sh | 2 +- exemples/kubernetes/crowdsec/values.yml | 2 +- exemples/kubernetes/traefik/values.yml | 4 ++-- exemples/redis-cache/docker-compose.redis.yml | 4 ++-- exemples/standalone-mode/docker-compose.alone.yml | 4 ++-- exemples/tls-auth/docker-compose.tls-auth.yml | 6 +++--- exemples/trusted-ips/docker-compose.trusted.yml | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index f199424..752efdf 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ experimental: plugins: bouncer: moduleName: github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin + version: vX.Y.Z # To update ``` ```yaml diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 6634006..95b137e 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -52,7 +52,7 @@ services: - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdseclapikey=44c36dac5c4140af9f06f397508e82c7" crowdsec: - image: crowdsecurity/crowdsec:v1.4.1 + image: crowdsecurity/crowdsec:v1.4.6 container_name: "crowdsec" restart: unless-stopped environment: diff --git a/docker-compose.yml b/docker-compose.yml index 1543aa7..ac15cd8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -14,7 +14,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.8" + - "--experimental.plugins.bouncer.version=v1.1.11" volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - "logs:/var/log/traefik" @@ -63,7 +63,7 @@ services: - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.forwardedheaderstrustedips=172.21.0.5" crowdsec: - image: crowdsecurity/crowdsec:v1.4.1 + image: crowdsecurity/crowdsec:v1.4.6 container_name: "crowdsec" restart: unless-stopped environment: diff --git a/exemples/behind-proxy/docker-compose.cloudflare.yml b/exemples/behind-proxy/docker-compose.cloudflare.yml index 5aa06ed..fee8aa9 100644 --- a/exemples/behind-proxy/docker-compose.cloudflare.yml +++ b/exemples/behind-proxy/docker-compose.cloudflare.yml @@ -2,7 +2,7 @@ version: "3.8" services: cloudflare: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "cloudflare" restart: unless-stopped command: @@ -12,7 +12,6 @@ services: - "--api.insecure=true" - "--entrypoints.web.address=:80" - "--providers.file.filename=/cloud.yaml" - - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - ./cloudflare-exemple.yaml:/cloud.yaml:ro @@ -22,7 +21,7 @@ services: - 8080:8080 traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -36,7 +35,7 @@ services: - "--entrypoints.web.forwardedheaders.trustedips=172.21.0.5" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.7" + - "--experimental.plugins.bouncer.version=v1.1.11" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - logs-traefik:/var/log/traefik @@ -46,7 +45,7 @@ services: depends_on: - crowdsec - whoami1: + whoami-foo: image: traefik/whoami container_name: "simple-service-foo" restart: unless-stopped @@ -66,7 +65,7 @@ services: - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.forwardedheaderstrustedips=172.21.0.5" - "traefik.http.middlewares.crowdsec-foo.plugin.bouncer.loglevel=DEBUG" - whoami2: + whoami-bar: image: traefik/whoami container_name: "simple-service-bar" restart: unless-stopped @@ -88,7 +87,7 @@ services: crowdsec: - image: crowdsecurity/crowdsec:v1.4.3 + image: crowdsecurity/crowdsec:v1.4.6 container_name: "crowdsec" restart: unless-stopped environment: diff --git a/exemples/binary-vm/scripts/install_traefik.sh b/exemples/binary-vm/scripts/install_traefik.sh index bbdebd5..a84f673 100644 --- a/exemples/binary-vm/scripts/install_traefik.sh +++ b/exemples/binary-vm/scripts/install_traefik.sh @@ -2,7 +2,7 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get install wget -y # DEBIAN_FRONTEND=noninteractive sudo apt-get upgrade -y --assume-yes -wget -O traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.9.6/traefik_v2.9.6_linux_amd64.tar.gz" +wget -O traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v2.9.10/traefik_v2.9.10_linux_amd64.tar.gz" tar -zxvf traefik.tar.gz # inspired from https://gist.github.com/ubergesundheit/7c9d875befc2d7bfd0bf43d8b3862d85 sudo mv ./traefik /usr/local/bin/ diff --git a/exemples/binary-vm/scripts/install_whoami.sh b/exemples/binary-vm/scripts/install_whoami.sh index 9ffb0ea..9dc3684 100644 --- a/exemples/binary-vm/scripts/install_whoami.sh +++ b/exemples/binary-vm/scripts/install_whoami.sh @@ -1,7 +1,7 @@ #!/bin/bash DEBIAN_FRONTEND=noninteractive sudo apt-get update && apt-get install wget -y -wget -O whoami.tar.gz "https://github.com/traefik/whoami/releases/download/v1.8.7/whoami_v1.8.7_linux_amd64.tar.gz" +wget -O whoami.tar.gz "https://github.com/traefik/whoami/releases/download/v1.9.0/whoami_v1.9.0_linux_amd64.tar.gz" tar -zxvf whoami.tar.gz # inspired from https://gist.github.com/ubergesundheit/7c9d875befc2d7bfd0bf43d8b3862d85 sudo mv ./whoami /usr/local/bin/ diff --git a/exemples/kubernetes/crowdsec/values.yml b/exemples/kubernetes/crowdsec/values.yml index 2a517b8..1d620a7 100644 --- a/exemples/kubernetes/crowdsec/values.yml +++ b/exemples/kubernetes/crowdsec/values.yml @@ -1,5 +1,5 @@ image: - tag: v1.4.4-rc1 + tag: v1.4.6 agent: acquisition: diff --git a/exemples/kubernetes/traefik/values.yml b/exemples/kubernetes/traefik/values.yml index 9be4375..786147c 100644 --- a/exemples/kubernetes/traefik/values.yml +++ b/exemples/kubernetes/traefik/values.yml @@ -1,5 +1,5 @@ image: - tag: v2.9.6 + tag: v2.9.10 logs: general: @@ -16,4 +16,4 @@ experimental: additionalArguments: - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.7-beta1" + - "--experimental.plugins.bouncer.version=v1.1.11" diff --git a/exemples/redis-cache/docker-compose.redis.yml b/exemples/redis-cache/docker-compose.redis.yml index df4f796..7c3ffa6 100644 --- a/exemples/redis-cache/docker-compose.redis.yml +++ b/exemples/redis-cache/docker-compose.redis.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.8" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -15,7 +15,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.11-beta2" + - "--experimental.plugins.bouncer.version=v1.1.11" # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro diff --git a/exemples/standalone-mode/docker-compose.alone.yml b/exemples/standalone-mode/docker-compose.alone.yml index 93e3607..29509d5 100644 --- a/exemples/standalone-mode/docker-compose.alone.yml +++ b/exemples/standalone-mode/docker-compose.alone.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -15,7 +15,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.7" + - "--experimental.plugins.bouncer.version=v1.1.11" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro ports: diff --git a/exemples/tls-auth/docker-compose.tls-auth.yml b/exemples/tls-auth/docker-compose.tls-auth.yml index 755319c..5f5e215 100644 --- a/exemples/tls-auth/docker-compose.tls-auth.yml +++ b/exemples/tls-auth/docker-compose.tls-auth.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -15,7 +15,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.7" + - "--experimental.plugins.bouncer.version=v1.1.11" # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro @@ -64,7 +64,7 @@ services: - "traefik.http.middlewares.crowdsec-bar.plugin.bouncer.crowdsecLapiTLSCertificateBouncerKeyFile=/etc/traefik/crowdsec-certs/bouncer-key.pem" crowdsec: - image: crowdsecurity/crowdsec:v1.4.3 + image: crowdsecurity/crowdsec:v1.4.6 container_name: "crowdsec" restart: unless-stopped environment: diff --git a/exemples/trusted-ips/docker-compose.trusted.yml b/exemples/trusted-ips/docker-compose.trusted.yml index f763c7a..00cb4d9 100644 --- a/exemples/trusted-ips/docker-compose.trusted.yml +++ b/exemples/trusted-ips/docker-compose.trusted.yml @@ -2,7 +2,7 @@ version: "3.8" services: traefik: - image: "traefik:v2.9.6" + image: "traefik:v2.9.10" container_name: "traefik" restart: unless-stopped command: @@ -15,7 +15,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.7" + - "--experimental.plugins.bouncer.version=v1.1.11" # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" volumes: - /var/run/docker.sock:/var/run/docker.sock:ro @@ -69,7 +69,7 @@ services: crowdsec: - image: crowdsecurity/crowdsec:v1.4.3 + image: crowdsecurity/crowdsec:v1.4.6 container_name: "crowdsec" restart: unless-stopped environment: