Merge pull request #247 from TimWolla/2.2-eol

Remove EOL 2.2

Author: yosifkit

2.2/Dockerfile

@@ -59,7 +59,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.2", "2.4", "2.6", "2.8") then
+		if env.version | IN("2.4", "2.6", "2.8") then
 			"5.3"
 		else
 			"5.4"
@@ -81,9 +81,6 @@ RUN set -eux; \
 		pcre2-dev \
 		readline-dev \
 		tar \
-{{ if env.version == "2.2" then ( -}}
-		zlib-dev \
-{{ ) else "" end -}}
 	; \
 {{ ) else ( -}}
 	savedAptMark="$(apt-mark showmanual)"; \
@@ -95,9 +92,6 @@ RUN set -eux; \
 		libssl-dev \
 		make \
 		wget \
-{{ if env.version == "2.2" then ( -}}
-		zlib1g-dev \
-{{ ) else "" end -}}
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 {{ ) end -}}
@@ -122,19 +116,7 @@ RUN set -eux; \
 		USE_LUA=1 LUA_INC=/usr/include/lua{{ lua }}{{ if env.variant == "alpine" then (" LUA_LIB=/usr/lib/lua" + lua) else "" end }} \
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
-{{ if env.version == "2.2" then ( -}}
-		USE_ZLIB=1 \
-{{ ) else "" end -}}
-{{ if env.version == "2.2" then "" else ( -}}
 		USE_PROMEX=1 \
-{{ ) end -}}
-		\
-		EXTRA_OBJS=" \
-{{ if env.version == "2.2" then ( -}}
-# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
-			contrib/prometheus-exporter/service-prometheus.o \
-{{ ) else "" end -}}
-		" \
 	'; \
 {{ if env.variant == "alpine" then ( -}}
 	\
@@ -188,18 +170,11 @@ RUN set -eux; \
 STOPSIGNAL SIGUSR1
 
 COPY docker-entrypoint.sh /usr/local/bin/
-{{ if env.version == "2.2" then ( -}}
-RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
-{{ ) else "" end -}}
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-{{ if env.version == "2.2" then ( -}}
-# no USER for backwards compatibility (to try to avoid breaking existing users)
-{{ ) else ( -}}
 USER haproxy
-{{ ) end -}}
 
-{{ if [ "2.2", "2.4", "2.6" ] | index(env.version) then ( -}}
+{{ if [ "2.4", "2.6" ] | index(env.version) then ( -}}
 # no WORKDIR for backwards compatibility (to try to avoid breaking existing users)
 {{ ) else ( -}}
 # https://github.com/docker-library/haproxy/issues/200

2.2/docker-entrypoint.sh

@@ -31,12 +31,6 @@ for version; do
 	rm -rf "$version/"
 
 	for variant in '' alpine; do
-		# 2.2 can't be built on Alpine greater than 3.16
-		# OpenSSL 3 incompatibilities (https://github.com/haproxy/haproxy/issues/1276)
-		# but Alpine 3.16 is end of life
-		if [ "$version" = '2.2' ] && [ "$variant" = 'alpine' ]; then
-			continue
-		fi
 		export version variant
 		dir="$version${variant:+/$variant}"
 

2.4/Dockerfile

@@ -93,7 +93,6 @@ for version; do
 		export variant
 		dir="$version${variant:+/$variant}"
 		if [ ! -d "$dir" ]; then
-			# 2.2 can't be built on a supported Alpine release
 			continue
 		fi
 

2.4/alpine/Dockerfile

@@ -1,10 +1,4 @@
 {
-  "2.2": {
-    "debian": "bullseye-slim",
-    "sha256": "0fb78d1f296c45c7546a9a3167d595fb1af9eaf9e9c16a9324f36c55fbf2f323",
-    "url": "https://www.haproxy.org/download/2.2/src/haproxy-2.2.34.tar.gz",
-    "version": "2.2.34"
-  },
   "2.4": {
     "alpine": "3.21",
     "debian": "bookworm-slim",

2.6/Dockerfile

@@ -14,7 +14,6 @@ versions=( "${versions[@]%/}" )
 
 defaultDebianSuite='bookworm-slim'
 declare -A debianSuite=(
-	[2.2]='bullseye-slim'
 )
 defaultAlpineVersion='3.21'
 declare -A alpineVersion=(
@@ -36,8 +35,6 @@ for version in "${versions[@]}"; do
 				debian: env.debian,
 				alpine: env.alpine,
 			}
-			# remove Alpine from versions where it cannot be built on any active Alpine release
-			| if env.version == "2.2" then del(.alpine) else . end
 		'
 	)"