8000 [v0.6] cherry picks by tonistiigi · Pull Request #1596 · moby/buildkit · GitHub
[go: up one dir, main page]
Skip to content

[v0.6] cherry picks #1596

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

Jump to bottom
Merged
merged 3 commits into from
Jul 25, 2020
Merged

[v0.6] cherry picks #1596

merged 3 commits into from
Jul 25, 2020

Conversation

tonistiigi
Copy link
Member
@tonistiigi tonistiigi commented Jul 25, 2020 •
edited
Loading

@tonistiigi tonistiigi requested a review from thaJeztah July 25, 2020 05:09
vladaionescu and others added 2 commits July 24, 2020 22:12
@vladaionescu @tonistiigi
Add --force flag in git fetch command
1c7109b 
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
(cherry picked from commit 4ce2075)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@vladaionescu @tonistiigi
Add comment about the use of --force
4ece504 
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
(cherry picked from commit cd4a80c)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
Treat unix sockets as regular files
3a0727e 
This fix is similar to the fix in moby#1144; but was hit in a different code
path.

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
(cherry picked from commit 5382a20)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@AkihiroSuda AkihiroSuda merged commit 45ecd88 into moby:docker-19.03 Jul 25, 2020
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jul 27, 2020
@thaJeztah
[19.03] vendor: moby/buildkit v0.6.4-26-ga1e4f48e
765245d 
full diff: moby/buildkit@4cb720e...a1e4f48

Brings in the cherry-picks from moby/buildkit#1596 and moby/buildkit#1598 :

- Add --force flag in git fetch command
- Fix socket handling during copy (Treat unix sockets as regular files)
- Remotecache: Only visit each item once when walking results.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Jul 27, 2020
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jul 28, 2020
@thaJeztah
[19.03] vendor: moby/buildkit v0.6.4-26-ga1e4f48e
422fa1b 
full diff: moby/buildkit@4cb720e...a1e4f48

Brings in the cherry-picks from moby/buildkit#1596 and moby/buildkit#1598 :

- Add --force flag in git fetch command
- Fix socket handling during copy (Treat unix sockets as regular files)
- Remotecache: Only visit each item once when walking results.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 765245d54b0aad21795e01f504bd1078552bef4a
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@thaJeztah thaJeztah Awaiting requested review from thaJeztah

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tonistiigi @AkihiroSuda @vladaionescu
0