Skip to content

Update to 1.7.13 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2021
Merged

Update to 1.7.13 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd07f9
Update to 1.7.13
TimWolla Mar 22, 2021
42989bf
(Re-)Apply the backported ebtree patch from upstream
tianon Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 1.7/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions 1.7/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"1.7": {
"alpine": "3.12",
"debian": "buster-slim",
"sha256": "4118178b553a107b227f3f84774c7a50ae0b3ac2be39211c3db511ed4efe48ce",
"url": "https://www.haproxy.org/download/1.7/src/haproxy-1.7.12.tar.gz",
"version": "1.7.12"
"sha256": "53ae3ae722236a56cc8b584bf1f8ef422fc40e9ce032d244e256c486c1713600",
"url": "https://www.haproxy.org/download/1.7/src/haproxy-1.7.13.tar.gz",
"version": "1.7.13"
},
"1.8": {
"alpine": "3.13",
Expand Down