mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
(Re-)Apply the backported ebtree patch from upstream
This commit is contained in:
1 parent
8cd07f9d33
commit
42989bf9ab
2 files changed
+18
No files matched your search
Generated
+8
@@ -45,6 +45,14 @@ RUN set -eux; \
|
||||
tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
|
||||
rm haproxy.tar.gz; \
|
||||
\
|
||||
# https://github.com/haproxy/haproxy/issues/760#issuecomment-804282562
|
||||
apk add --no-cache --virtual .build-deps-patch patch; \
|
||||
# https://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=3280d0ab43e03ae5e94da205630fa576d7633627
|
||||
wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-1.7.git;a=patch;h=3280d0ab43e03ae5e94da205630fa576d7633627'; \
|
||||
echo '8c8176604a9638d57fc4385154d8d2622d4ae52422ea53a5b91fac49459cfd2d *ebtree.patch' | sha256sum -c -; \
|
||||
patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy; \
|
||||
apk del --no-network .build-deps-patch; \
|
||||
\
|
||||
makeOpts=' \
|
||||
CFLAGS+="-Wno-address-of-packed-member" \
|
||||
TARGET=linux2628 \
|
||||
|
||||
@@ -70,6 +70,16 @@ RUN set -eux; \
|
||||
tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
|
||||
rm haproxy.tar.gz; \
|
||||
\
|
||||
{{ if env.version == "1.7" and env.variant == "alpine" then ( -}}
|
||||
# https://github.com/haproxy/haproxy/issues/760#issuecomment-804282562
|
||||
apk add --no-cache --virtual .build-deps-patch patch; \
|
||||
# https://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=3280d0ab43e03ae5e94da205630fa576d7633627
|
||||
wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-1.7.git;a=patch;h=3280d0ab43e03ae5e94da205630fa576d7633627'; \
|
||||
echo '8c8176604a9638d57fc4385154d8d2622d4ae52422ea53a5b91fac49459cfd2d *ebtree.patch' | sha256sum -c -; \
|
||||
patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy; \
|
||||
apk del --no-network .build-deps-patch; \
|
||||
\
|
||||
{{ ) else "" end -}}
|
||||
{{
|
||||
def haproxy_target:
|
||||
if env.version | startswith("1.") then
|
||||
|
||||
Reference in new issue
Block a user