Skip to content

[v0.9] cherry-picks#2386

Merged
tonistiigi merged 7 commits into
moby:v0.9from
tonistiigi:v0.9-picks-10012021
Oct 2, 2021
Merged

[v0.9] cherry-picks#2386
tonistiigi merged 7 commits into
moby:v0.9from
tonistiigi:v0.9-picks-10012021

Conversation

@tonistiigi
Copy link
Copy Markdown
Member

dockerfile: fix parsing required key without value #2304

control: fix 64bit alignment for buildcount #2324

resolver timeout fixes #2369

Fix flakiness during import of a cache with empty layers removed #2372

tonistiigi and others added 6 commits October 1, 2021 14:50
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6735224)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 5cfe388)
hosts mutex is called on initialization, meaning `GetResolver` might
block if it is in the middle of auth exchange. This is currently bad
in the case where Job initialization needs to register a name before
timeout is reached.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6bd2eb5)
Authorizer stores the current session.Group so if it is
overwritten for another resolver it means that session might
have been dropped and authentication will fail.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit f62bb55)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 161b581)
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.me>
(cherry picked from commit 2c540bd)
@tonistiigi tonistiigi requested a review from AkihiroSuda October 1, 2021 21:53
@sipsma
Copy link
Copy Markdown
Collaborator

sipsma commented Oct 1, 2021

You mentioned in this comment you may want a few commits from there also in the v0.9 branch: #2273 (comment)

Doesn't matter to me either way, just mentioning in case leaving them out here was unintentional.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
(cherry picked from commit 808091a)
@tonistiigi
Copy link
Copy Markdown
Member Author

@sipsma Thanks.

Added 808091a from #2273

@tonistiigi tonistiigi merged commit cf59036 into moby:v0.9 Oct 2, 2021
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.

4 participants