Skip to content

Commit 0a7bd76

Browse files
committed
Remove EOL 1.8
1 parent 863eb4e commit 0a7bd76

File tree

7 files changed

+7
-247
lines changed

7 files changed

+7
-247
lines changed

1.8/Dockerfile

Lines changed: 0 additions & 101 deletions
This file was deleted.

1.8/alpine/Dockerfile

Lines changed: 0 additions & 94 deletions
This file was deleted.

1.8/alpine/docker-entrypoint.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

1.8/docker-entrypoint.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

Dockerfile.template

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN set -eux; \
5252
pcre2-dev \
5353
readline-dev \
5454
tar \
55-
{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
55+
{{ if ([ "2.0", "2.2" ] | index(env.version)) then ( -}}
5656
zlib-dev \
5757
{{ ) else "" end -}}
5858
; \
@@ -67,7 +67,7 @@ RUN set -eux; \
6767
libssl-dev \
6868
make \
6969
wget \
70-
{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
70+
{{ if ([ "2.0", "2.2" ] | index(env.version)) then ( -}}
7171
zlib1g-dev \
7272
{{ ) else "" end -}}
7373
; \
@@ -82,9 +82,7 @@ RUN set -eux; \
8282
\
8383
{{
8484
def haproxy_target:
85-
if env.version | startswith("1.") then
86-
"linux2628"
87-
elif env.variant == "alpine" and env.version != "2.0" then
85+
if env.variant == "alpine" and env.version != "2.0" then
8886
"linux-musl"
8987
else
9088
"linux-glibc"
@@ -96,10 +94,10 @@ RUN set -eux; \
9694
USE_LUA=1 LUA_INC=/usr/include/lua5.3 {{ if env.variant == "alpine" then "LUA_LIB=/usr/lib/lua5.3 " else "" end }}\
9795
USE_OPENSSL=1 \
9896
USE_PCRE2=1 USE_PCRE2_JIT=1 \
99-
{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version)) then ( -}}
97+
{{ if ([ "2.0", "2.2" ] | index(env.version)) then ( -}}
10098
USE_ZLIB=1 \
10199
{{ ) else "" end -}}
102-
{{ if ([ "1.8", "2.0", "2.2" ] | index(env.version) | not) then ( -}}
100+
{{ if ([ "2.0", "2.2" ] | index(env.version) | not) then ( -}}
103101
USE_PROMEX=1 \
104102
{{ ) else "" end -}}
105103
\
@@ -162,12 +160,12 @@ RUN set -eux; \
162160
STOPSIGNAL SIGUSR1
163161

164162
COPY docker-entrypoint.sh /usr/local/bin/
165-
{{ if [ "1.8", "2.0", "2.2" ] | index(env.version) then ( -}}
163+
{{ if [ "2.0", "2.2" ] | index(env.version) then ( -}}
166164
RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
167165
{{ ) else "" end -}}
168166
ENTRYPOINT ["docker-entrypoint.sh"]
169167

170-
{{ if [ "1.8", "2.0", "2.2" ] | index(env.version) then ( -}}
168+
{{ if [ "2.0", "2.2" ] | index(env.version) then ( -}}
171169
# no USER for backwards compatibility (to try to avoid breaking existing users)
172170
{{ ) else ( -}}
173171
USER haproxy

versions.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
{
2-
"1.8": {
3-
"alpine": "3.16",
4-
"debian": "buster-slim",
5-
"sha256": "7fc2ff38c665e19bdc10de48de5512dbc5548efe7555a655a13a90afa481eaeb",
6-
"url": "https://www.haproxy.org/download/1.8/src/haproxy-1.8.31.tar.gz",
7-
"version": "1.8.31"
8-
},
92
"2.0": {
103
"alpine": "3.16",
114
"debian": "buster-slim",

versions.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ versions=( "${versions[@]%/}" )
1414

1515
defaultDebianSuite='bullseye-slim'
1616
declare -A debianSuite=(
17-
[1.8]='buster-slim'
1817
[2.0]='buster-slim'
1918
)
2019
defaultAlpineVersion='3.17'
2120
declare -A alpineVersion=(
2221
# OpenSSL 3 incompatibilities
23-
[1.8]='3.16'
2422
[2.0]='3.16'
2523
)
2624

0 commit comments

Comments
 (0)