Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"config:recommended",
":disableDependencyDashboard"
],
"ignorePaths": [
"**/tests/**"
],
"packageRules": [
{
"description": "Track only HAProxy LTS branches. Upstream ships LTS on even minors (3.0, 3.2, 3.4, ...) with ~5 years of support; odd minors (3.1, 3.3, ...) are non-LTS and go EOL about a year after release. See https://www.haproxy.org/ for branch status.",
"matchDatasources": ["docker"],
"matchPackageNames": ["docker.io/library/haproxy", "haproxy"],
"allowedVersions": "/^\\d+\\.\\d*[02468](\\.\\d+)?(-alpine.*)?$/",
"groupName": "haproxy base image"
},
{
"description": "A HAProxy minor bump can change SPOP mux behaviour, which the pinned haproxy-python-spoa commit compensates for. Keep those PRs separate from routine patch bumps so the SPOE agent gets tested against the new branch.",
"matchDatasources": ["docker"],
"matchPackageNames": ["docker.io/library/haproxy", "haproxy"],
"matchUpdateTypes": ["major", "minor"],
"groupName": "haproxy LTS branch upgrade",
"addLabels": ["needs-spoe-testing"]
},
{
"description": "Group GitHub Actions bumps into a single PR.",
"matchManagers": ["github-actions"],
"groupName": "github-actions"
}
]
}
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# - HP_SHARED_KEY or HP_SHARED_KEY_FILE must be provided at runtime.
# -------------------------------------------------------------------------

FROM docker.io/library/haproxy:3.2.22-alpine3.24
FROM docker.io/library/haproxy:3.4.4-alpine3.24

USER root

Expand Down Expand Up @@ -67,8 +67,8 @@ RUN set -ex; \

# Install the Python SPOA library.
# Pinned to a commit: the single-write frame emission it contains is required for
# HAProxy 3.2+, whose SPOP mux resets connections when a frame arrives split
# across TCP segments. Bump this deliberately together with the library.
# HAProxy 3.2+ (we run 3.4 LTS), whose SPOP mux resets connections when a frame
# arrives split across TCP segments. Bump this deliberately together with the library.
RUN pip install --break-system-packages \
pydantic==2.13.4 \
git+https://github.com/cloud-py-api/haproxy-python-spoa.git@f00f3f7b1b0f56e10052af6c0d07e81c5195d84d
Expand Down
2 changes: 1 addition & 1 deletion development/debugging/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

FROM haproxy:3.2.22-alpine3.24
FROM haproxy:3.4.4-alpine3.24

USER root

Expand Down
Loading