Skip to content

Commit 42989bf

Browse files
committed
(Re-)Apply the backported ebtree patch from upstream
1 parent 8cd07f9 commit 42989bf

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

1.7/alpine/Dockerfile

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ RUN set -eux; \
7070
tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
7171
rm haproxy.tar.gz; \
7272
\
73+
{{ if env.version == "1.7" and env.variant == "alpine" then ( -}}
74+
# https://github.com/haproxy/haproxy/issues/760#issuecomment-804282562
75+
apk add --no-cache --virtual .build-deps-patch patch; \
76+
# https://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=3280d0ab43e03ae5e94da205630fa576d7633627
77+
wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-1.7.git;a=patch;h=3280d0ab43e03ae5e94da205630fa576d7633627'; \
78+
echo '8c8176604a9638d57fc4385154d8d2622d4ae52422ea53a5b91fac49459cfd2d *ebtree.patch' | sha256sum -c -; \
79+
patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy; \
80+
apk del --no-network .build-deps-patch; \
81+
\
82+
{{ ) else "" end -}}
7383
{{
7484
def haproxy_target:
7585
if env.version | startswith("1.") then

0 commit comments

Comments
 (0)