spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #997 from basecamp/traefik-2.11

Browse Source 
Traefik 2.11 default to address CVE-2024-45410
This commit is contained in:
Donal McBreen
2024-09-30 03:14:08 -04:00
committed by GitHub
parent 9db1403721 b058c45973
commit fa05270cac
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/kamal/configuration/docs/traefik.yml
View File

@@ -17,8 +17,8 @@ traefik:
# Image
#
# The Traefik image to use, defaults to `traefik:v2.10`
image: traefik:v2.9
# The Traefik image to use, defaults to `traefik:v2.11`
image: traefik:v2.11
# Host port
#

2
lib/kamal/configuration/traefik.rb
View File

@@ -1,5 +1,5 @@
class Kamal::Configuration::Traefik
DEFAULT_IMAGE = "traefik:v2.10"
DEFAULT_IMAGE = "traefik:v2.11"
CONTAINER_PORT = 80
DEFAULT_ARGS = {
"log.level" => "DEBUG"

2
test/cli/traefik_test.rb
View File

@@ -139,7 +139,7 @@ class CliTraefikTest < CliTestCase
assert_match "docker image prune --all --force --filter label=org.opencontainers.image.title=Traefik", output
assert_match "/usr/bin/env mkdir -p .kamal", output
assert_match "docker login -u [REDACTED] -p [REDACTED]", output
assert_match "docker container start traefik || docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --env-file .kamal/env/traefik/traefik.env --log-opt max-size=\"10m\" --label traefik.http.routers.catchall.entryPoints=\"http\" --label traefik.http.routers.catchall.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.routers.catchall.service=\"unavailable\" --label traefik.http.routers.catchall.priority=\"1\" --label traefik.http.services.unavailable.loadbalancer.server.port=\"0\" traefik:v2.10 --providers.docker --log.level=\"DEBUG\"", output
assert_match "docker container start traefik || docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --env-file .kamal/env/traefik/traefik.env --log-opt max-size=\"10m\" --label traefik.http.routers.catchall.entryPoints=\"http\" --label traefik.http.routers.catchall.rule=\"PathPrefix(\\`/\\`)\" --label traefik.http.routers.catchall.service=\"unavailable\" --label traefik.http.routers.catchall.priority=\"1\" --label traefik.http.services.unavailable.loadbalancer.server.port=\"0\" traefik:v2.11 --providers.docker --log.level=\"DEBUG\"", output
assert_match "/usr/bin/env mkdir -p .kamal", output
assert_match %r{docker rename app-web-latest app-web-latest_replaced_.*}, output
assert_match %r{docker run --detach --restart unless-stopped --name app-web-latest --hostname 1.1.1.1-.* -e KAMAL_CONTAINER_NAME="app-web-latest" -e KAMAL_VERSION="latest" --env-file .kamal/env/roles/app-web.env --health-cmd}, output

2
test/integration/docker/deployer/app/config/deploy.yml
View File

@@ -33,7 +33,7 @@ traefik:
args:
accesslog: true
accesslog.format: json
image: registry:4443/traefik:v2.10
image: registry:4443/traefik:v2.11
accessories:
busybox:
service: custom-busybox

2
test/integration/docker/deployer/app_with_roles/config/deploy.yml
View File

@@ -27,7 +27,7 @@ traefik:
args:
accesslog: true
accesslog.format: json
image: registry:4443/traefik:v2.10
image: registry:4443/traefik:v2.11
accessories:
busybox:
service: custom-busybox

2
test/integration/docker/deployer/setup.sh
View File

@@ -19,7 +19,7 @@ push_image_to_registry_4443() {
install_kamal
push_image_to_registry_4443 nginx 1-alpine-slim
push_image_to_registry_4443 traefik v2.10
push_image_to_registry_4443 traefik v2.11
push_image_to_registry_4443 busybox 1.36.0
# .ssh is on a shared volume that persists between runs. Clean it up as the

2
test/integration/main_test.rb
View File

@@ -32,7 +32,7 @@ class MainTest < IntegrationTest
assert_match /Traefik Host: vm2/, details
assert_match /App Host: vm1/, details
assert_match /App Host: vm2/, details
assert_match /traefik:v2.10/, details
assert_match /traefik:v2.11/, details
assert_match /registry:4443\/app:#{first_version}/, details
audit = kamal :audit, capture: true

4
test/integration/traefik_test.rb
View File

@@ -52,11 +52,11 @@ class TraefikTest < IntegrationTest
private
def assert_traefik_running
assert_match /traefik:v2.10 "\/entrypoint.sh/, traefik_details
assert_match /traefik:v2.11 "\/entrypoint.sh/, traefik_details
end
def assert_traefik_not_running
assert_no_match /traefik:v2.10 "\/entrypoint.sh/, traefik_details
assert_no_match /traefik:v2.11 "\/entrypoint.sh/, traefik_details
end
def traefik_details