Skip to content
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

[v0.10][Moby LTS] Backport 4600 4602 4603 4604 #4642

Closed
wants to merge 10 commits into from
Closed

[v0.10][Moby LTS] Backport 4600 4602 4603 4604 #4642

wants to merge 10 commits into from

Commits on Feb 16, 2024

  1. Move container.go to a separate module 

    Signed-off-by: Andrey Epifanov <[email protected]>
    @aepifanov
    aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    7a3af2a View commit details
    Browse the repository at this point in the history

  2. gateway: pass executor with build and not access worker directly 

    Running interactive container APIs was done by giving
the gateway implementation access to worker controller
directly, but it should be passed with a build job instead.

Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 0971dffaab93d91e51af984b44c745b35b3c5b4d)
(cherry picked from commit 564f884e7bb6db9c63e03c3b081ea71e15aa7980)
(cherry picked from commit 5026d95)
Signed-off-by: Andrey Epifanov <[email protected]>

`bridgeClient` is made exported since exported func LLBBridgeToGatewayClient should have exported-return

Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	executor/executor.go
#	frontend/gateway/container/container.go
#	frontend/gateway/forwarder/forward.go
#	frontend/gateway/forwarder/frontend.go
#	frontend/gateway/gateway.go
#	solver/llbsolver/bridge.go
#	solver/llbsolver/provenance.go
#	solver/llbsolver/solver.go
#	worker/workercontroller.go
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    a9b0450 View commit details
    Browse the repository at this point in the history

  3. llbsolver: make sure interactive container API validates entitlements 

    Ensure interactive calls validate same conditions that
the build requests do. Refactor of the build side is to ensure
we use the same validation function for both cases. There
was no validation issue with the LLB validation.

Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit d1970522d7145be5f4a1f1a028b1910bb527126c)
(cherry picked from commit e1e30278d0a491dfd34bd80fa66b54106614cffa)
(cherry picked from commit 92cc595)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	client/build_test.go
#	solver/llbsolver/bridge.go
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    8487af1 View commit details
    Browse the repository at this point in the history

  4. MountStubsCleaner: preserve timestamps 

    Fix issue 3148

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 0b5a315)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	client/client_test.go
    @AkihiroSuda @aepifanov
    AkihiroSuda authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    f58634f View commit details
    Browse the repository at this point in the history

  5. executor: stubs cleaner should remove empty directory mounts 

    On Linux, an empty directory is usually 4096 bytes, not 0, so we need an
additional explicit check here.

Signed-off-by: Justin Chadwell <[email protected]>
(cherry picked from commit 6778973)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	client/client_test.go
    @jedevc @aepifanov
    jedevc authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    5c3e1eb View commit details
    Browse the repository at this point in the history

  6. chore: tidy atime_unix.go to use errors pkg 

    Signed-off-by: Justin Chadwell <[email protected]>
(cherry picked from commit 32b5e4d)
    @jedevc @aepifanov
    jedevc authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    067baa8 View commit details
    Browse the repository at this point in the history

  7. executor: recheck mount stub path within root after container run 

    Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 96ccaec09c51176a6d954fd7c4ce57d519bae1b2)
(cherry picked from commit a9523c6476f39bb44dd02bcab19e8cb25c5bc37b)
(cherry picked from commit 00fe637)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	executor/stubs.go
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    51f9450 View commit details
    Browse the repository at this point in the history

  8. oci: fix error handling on submount calls 

    Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 42d866e)
(cherry picked from commit e81066f8a8623dc876f3d64fae8f693c17ecdc1a)
(cherry picked from commit d089e0b)
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    eb5b326 View commit details
    Browse the repository at this point in the history

  9. exec: add extra validation for submount sources 

    While submount paths were already validated there are some
cases where the parent mount may not be immutable while the
submount is created.

Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 2529ec4121bcd8c35bcd96218083da175c2e5b77)
(cherry picked from commit cbc233b3b695918d92fd5b1407b829296c53db70)
(cherry picked from commit f781267)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	executor/oci/spec.go
#	executor/oci/spec_windows.go
#	snapshot/localmounter_unix.go
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    b379ed2 View commit details
    Browse the repository at this point in the history

  10. update runc to v1.1.12 

    Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit bac3f2b)
Signed-off-by: Andrey Epifanov <[email protected]>

# Conflicts:
#	Dockerfile
    @tonistiigi @aepifanov
    tonistiigi authored and aepifanov committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    7f34166 View commit details
    Browse the repository at this point in the history