Merge pull request #190 from TimWolla/2.3-eol

Remove EOL 2.3

Author: tianon

2.3/Dockerfile

@@ -52,7 +52,7 @@ RUN set -eux; \
 		pcre2-dev \
 		readline-dev \
 		tar \
-{{ if ([ "1.8", "2.0", "2.2", "2.3" ] | index(env.version)) then ( -}}
+{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
 		zlib-dev \
 {{ ) else "" end -}}
 	; \
@@ -67,7 +67,7 @@ RUN set -eux; \
 		libssl-dev \
 		make \
 		wget \
-{{ if ([ "1.8", "2.0", "2.2", "2.3" ] | index(env.version)) then ( -}}
+{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
 		zlib1g-dev \
 {{ ) else "" end -}}
 	; \
@@ -96,15 +96,15 @@ RUN set -eux; \
 		USE_LUA=1 LUA_INC=/usr/include/lua5.3 {{ if env.variant == "alpine" then "LUA_LIB=/usr/lib/lua5.3 " else "" end }}\
 		USE_OPENSSL=1 \
 		USE_PCRE2=1 USE_PCRE2_JIT=1 \
-{{ if ([ "1.8", "2.0", "2.2", "2.3" ] | index(env.version)) then ( -}}
+{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
 		USE_ZLIB=1 \
 {{ ) else "" end -}}
-{{ if ([ "1.8", "2.0", "2.2", "2.3" ] | index(env.version) | not) then ( -}}
+{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version) | not) then ( -}}
 		USE_PROMEX=1 \
 {{ ) else "" end -}}
 		\
 		EXTRA_OBJS=" \
-{{ if [ "2.0", "2.2", "2.3" ] | index(env.version) then ( -}}
+{{ if [ "2.0", "2.2" ] | index(env.version) 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 -}}
@@ -162,12 +162,12 @@ RUN set -eux; \
 STOPSIGNAL SIGUSR1
 
 COPY docker-entrypoint.sh /usr/local/bin/
-{{ if [ "1.8", "2.0", "2.2", "2.3" ] | index(env.version) then ( -}}
+{{ if [ "1.8", "2.0", "2.2" ] | index(env.version) then ( -}}
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 {{ ) else "" end -}}
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-{{ if [ "1.8", "2.0", "2.2", "2.3" ] | index(env.version) then ( -}}
+{{ if [ "1.8", "2.0", "2.2" ] | index(env.version) then ( -}}
 # no USER for backwards compatibility (to try to avoid breaking existing users)
 {{ ) else ( -}}
 USER haproxy

2.3/alpine/Dockerfile

@@ -20,13 +20,6 @@
     "url": "https://www.haproxy.org/download/2.2/src/haproxy-2.2.25.tar.gz",
     "version": "2.2.25"
   },
-  "2.3": {
-    "alpine": "3.16",
-    "debian": "bullseye-slim",
-    "sha256": "15b51b24ccc3366db92ddb9ebf6880af2657842d67d1756ff1ac6d90151de668",
-    "url": "https://www.haproxy.org/download/2.3/src/haproxy-2.3.21.tar.gz",
-    "version": "2.3.21"
-  },
   "2.4": {
     "alpine": "3.16",
     "debian": "bullseye-slim",