Skip to content

Update to 1.7.13#145

Merged
tianon merged 2 commits into
docker-library:masterfrom
TimWolla:haproxy-1.7
Mar 26, 2021
Merged

Update to 1.7.13#145
tianon merged 2 commits into
docker-library:masterfrom
TimWolla:haproxy-1.7

Conversation

@TimWolla

Copy link
Copy Markdown
Contributor

For some reason the bot did not pick this up.

@tianon

tianon commented Mar 22, 2021

Copy link
Copy Markdown
Member

The Alpine-related build failures here are the underlying reason why the bot "missed" both this and #146. 😬

(We have a newer pattern for update.sh that we've implemented in other repositories that helps us do piecemeal updates which would avoid things like #146 getting delayed thanks to this build failure, but we obviously haven't implemented that here yet. 😅)

@tianon

tianon commented Mar 22, 2021

Copy link
Copy Markdown
Member

The failure looks like it's the same underlying issue as haproxy/haproxy#760, now backported to 1.7. 😄

@TimWolla

Copy link
Copy Markdown
Contributor Author

The failure looks like it's the same underlying issue as haproxy/haproxy#760

Ah, yeah. I remember. I've reopened that issue.

@tianon

tianon commented Mar 26, 2021

Copy link
Copy Markdown
Member

I rebased this on top of #148 and added a new commit to re-apply the patch for haproxy/haproxy#760 (similar to #126 + #128).

@tianon
tianon merged commit 414915c into docker-library:master Mar 26, 2021
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Mar 26, 2021
Changes:

- docker-library/haproxy@414915c: Merge pull request docker-library/haproxy#145 from TimWolla/haproxy-1.7
- docker-library/haproxy@42989bf: (Re-)Apply the backported ebtree patch from upstream
- docker-library/haproxy@8cd07f9: Update to 1.7.13
- docker-library/haproxy@102c0e1: Merge pull request docker-library/haproxy#148 from infosiftr/jq-template
- docker-library/haproxy@39812f8: Add initial jq-based templating engine
- docker-library/haproxy@ed0324b: Merge pull request docker-library/haproxy#147 from TimWolla/haproxy-2.3.8
- docker-library/haproxy@c2c4ab0: Update to 2.3.8
- docker-library/haproxy@dacda08: Merge pull request docker-library/haproxy#144 from TimWolla/remove-2.1
- docker-library/haproxy@02a4f51: Merge pull request docker-library/haproxy#146 from TimWolla/haproxy-2.4
- docker-library/haproxy@1f1ec5e: Update to 2.4-dev13
- docker-library/haproxy@c942740: Remove EOL 2.1
@TimWolla
TimWolla deleted the haproxy-1.7 branch March 26, 2021 16:45
@TimWolla

Copy link
Copy Markdown
Contributor Author

I rebased this […]

ack. That's why I leave the "allow maintainer pushes" enabled. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants