Skip to content

[19.03] vendor: moby/buildkit v0.6.4-26-ga1e4f48e#41269

Merged
tiborvass merged 1 commit intomoby:19.03from
thaJeztah:19.03_update_buildkit
Jul 27, 2020
Merged

[19.03] vendor: moby/buildkit v0.6.4-26-ga1e4f48e#41269
tiborvass merged 1 commit intomoby:19.03from
thaJeztah:19.03_update_buildkit

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jul 27, 2020 •
edited
Loading

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.

@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 changed the base branch from master to 19.03 July 27, 2020 18:19
@thaJeztah thaJeztah changed the title 19.03 update buildkit [19.03] vendor: moby/buildkit v0.6.4-26-ga1e4f48e Jul 27, 2020
@thaJeztah thaJeztah added this to the 19.03.13 milestone Jul 27, 2020
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 27, 2020

LOL looks like we're using the old apt repo in our tests, and they're busy phasing those out;

=== RUN   TestDockerSuite/TestRunNonRootUserResolvName
    --- FAIL: TestDockerSuite/TestRunNonRootUserResolvName (0.51s)
        cli.go:35: assertion failed: 
            Command:  /usr/local/cli/docker run --name=testperm --user=nobody busybox nslookup apt.dockerproject.org
            ExitCode: 1
            Error:    exit status 1
            Stdout:   Server:    10.100.0.2
            Address 1: 10.100.0.2 ip-10-100-0-2.ec2.internal
            
            
            Stderr:   nslookup: can't resolve 'apt.dockerproject.org'
            
            
            Failures:
            ExitCode was 1 expected 0
            Expected no error

@thaJeztah thaJeztah mentioned this pull request Jul 27, 2020
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jul 27, 2020

Opened #41270 to fix that test

@tiborvass tiborvass merged commit d49278c into moby:19.03 Jul 27, 2020
@thaJeztah thaJeztah deleted the 19.03_update_buildkit branch July 27, 2020 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

@tiborvass tiborvass tiborvass approved these changes

@cpuguy83 cpuguy83 Awaiting requested review from cpuguy83

@johnstep johnstep Awaiting requested review from johnstep

@tianon tianon Awaiting requested review from tianon

Assignees

No one assigned

Labels

area/builder Build status/2-code-review

Projects

None yet

Milestone

19.03.13

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @tonistiigi @tiborvass