Merge pull request #208 from TimWolla/2.5-eol

Remove EOL 2.5
docker-library · May 3, 2023 · 672045d · 672045d
2 parents b5e4baa + da2d46e
commit 672045d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 239 deletions.
diff --git a/2.5/Dockerfile b/2.5/Dockerfile
diff --git a/2.5/alpine/Dockerfile b/2.5/alpine/Dockerfile
diff --git a/2.5/alpine/docker-entrypoint.sh b/2.5/alpine/docker-entrypoint.sh
diff --git a/2.5/docker-entrypoint.sh b/2.5/docker-entrypoint.sh
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -171,7 +171,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 USER haproxy
 {{ ) end -}}
 
-{{ if [ "2.0", "2.2", "2.4", "2.5", "2.6" ] | index(env.version) then ( -}}
+{{ if [ "2.0", "2.2", "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

diff --git a/versions.json b/versions.json
@@ -20,13 +20,6 @@
     "url": "https://www.haproxy.org/download/2.4/src/haproxy-2.4.22.tar.gz",
     "version": "2.4.22"
   },
-  "2.5": {
-    "alpine": "3.17",
-    "debian": "bullseye-slim",
-    "sha256": "a0a44945687de3778a5c389f64fbede7be82f1ff2645eb1cc098822af8f4652a",
-    "url": "https://www.haproxy.org/download/2.5/src/haproxy-2.5.14.tar.gz",
-    "version": "2.5.14"
-  },
   "2.6": {
     "alpine": "3.17",
     "debian": "bullseye-slim",