Skip to content

Remove 2.4 (EOL) #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tianon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove 2.4 (EOL) #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
110 changes: 0 additions & 110 deletions 2.4/Dockerfile
View file
Open in desktop

This file was deleted.

103 changes: 0 additions & 103 deletions 2.4/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions 2.4/alpine/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions 2.4/docker-entrypoint.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ENV HAPROXY_SHA256 {{ .sha256 }}
# Since 5.4 is supported on haproxy, better use it now, but only for
# newer versions since there could be some minor incompatibilities
# for existing scripts: https://www.lua.org/manual/5.4/manual.html#8
if env.version | IN("2.4", "2.6", "2.8") then
if env.version | IN("2.6", "2.8") then
"5.3"
else
"5.4"
Expand Down Expand Up @@ -121,7 +121,7 @@ RUN set -eux; \
USE_PROMEX=1 \
# https://github.com/haproxy/haproxy/blob/a203ce685464988afbd92c8a376fcafae9bab5b5/INSTALL#L368-L373
USE_PTHREAD_EMULATION=1 \
{{ if env.version | IN("2.4", "2.6", "2.8", "3.0") then "" else ( -}}
{{ if env.version | IN("2.6", "2.8", "3.0") then "" else ( -}}
# https://www.haproxy.com/blog/announcing-haproxy-3-2#quic-protocol
# [in 3.2] QUIC TLS API was ported to OpenSSL 3.5
# Openssl 3.5+ is available on Debian Trixie and Alpine 3.22 and newer
Expand Down Expand Up @@ -185,7 +185,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]

USER haproxy

{{ if env.version | IN("2.4", "2.6") then ( -}}
{{ if env.version | IN("2.6") then ( -}}
# no WORKDIR for backwards compatibility (to try to avoid breaking existing users)
{{ ) else ( -}}
# https://github.com/docker-library/haproxy/issues/200
Expand Down
7 changes: 0 additions & 7 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"2.4": {
"alpine": "3.23",
"debian": "trixie-slim",
"sha256": "931ad4de3f036ac8f18a5f1370460aed69dc5b0b0d3fa228dddb7211970fb44a",
"url": "https://www.haproxy.org/download/2.4/src/haproxy-2.4.35.tar.gz",
"version": "2.4.35"
},
"2.6": {
"alpine": "3.23",
"debian": "trixie-slim",
Expand Down
Loading