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

Update to BuildKit 0.12 #45966

Merged
merged 11 commits into from
Sep 22, 2023
Merged

Update to BuildKit 0.12 #45966

merged 11 commits into from
Sep 22, 2023

Commits on Sep 21, 2023

  1. builder-next: make stub executor generic 

    The current executor is only tested on Linux, so let's be honest about
that. Stubbing this correctly helps avoid incorrectly trying to call
into Linux-only code in e.g. libnetwork.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    79a4cbb View commit details
    Browse the repository at this point in the history

  2. vendor: github.com/containerd/containerd v1.7.6 

    The DeepEqual ignore required in the daemon tests is a bit ugly, but it
works given the new protoc output.

We also have to ignore lints related to schema1 deprecations; these do
not apply as we must continue to support this schema version.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fd6dd69 View commit details
    Browse the repository at this point in the history

  3. daemon/c8d: use new containerd LabelDistributionSource constant 

    Introduced in containerd/containerd@dd3eedf

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8cd5f04 View commit details
    Browse the repository at this point in the history

  4. vendor: github.com/moby/buildkit v0.12.2 

    The following changes were required:
* integration/build: progressui's signature changed in moby/buildkit@6b8fbed
* builder-next: flightcontrol.Group has become a generic type in moby/buildkit@8ffc03b
* builder-next/executor: add github.com/moby/buildkit/executor/resources types, necessitated by moby/buildkit@6e87e4b
* builder-next: stub util/network/Namespace.Sample(), necessitated by moby/buildkit@963f161

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted @crazy-max @thaJeztah
    3 people committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    c217e3c View commit details
    Browse the repository at this point in the history

  5. builder-next: adopt new wrapped types 

    With BuildKit 0.12, some existing types are now required to be wrapped
by new types:

* containerd's LeaseManager and ContentStore have to be a
  (namespace-aware) BuildKit type since moby/buildkit@f044e0a
* BuildKit's solver.CacheManager is used instead of
  bboltstorage.CacheKeyStorage since moby/buildkit@2b30693
* The MaxAge config field is a bkconfig.Duration since moby/buildkit@e06c962

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    2246297 View commit details
    Browse the repository at this point in the history

  6. builder-next: apply source policies on config resolve 

    SourcePolicy was accounted for in moby/buildkit@330cf7a

TODO: replace applySourcePolicies with BuildKit's implementation, which
is currently unexported.

Co-authored-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted @tonistiigi
    neersighted and tonistiigi committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    221b73e View commit details
    Browse the repository at this point in the history

  7. builder-next/pull: use ResolveMode.String() helper 

    Introduced years ago in moby/buildkit@6644e1b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a728bd0 View commit details
    Browse the repository at this point in the history

  8. builder-next/wrapper: use new exptypes constants 

    Introduced in moby/buildkit@4fc2d7b

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    c8773e1 View commit details
    Browse the repository at this point in the history

  9. builder-next/a/ci/pull: strongly type flightcontrol.Group 

    Now that this is a generic, we can define a struct type at the package
level, and remove the casting logic necessary when we had to use
interface{}.

Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @neersighted
    neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    34e71b3 View commit details
    Browse the repository at this point in the history

  10. ci(buildkit): expose github runtime for gha tests 

    This exposes `ACTIONS_RUNTIME_TOKEN` and `ACTIONS_CACHE_URL`, which are
used to skip cache exporter tests, when combined with
moby/buildkit@a8789cb

Co-authored-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @crazy-max @neersighted
    crazy-max and neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    286704b View commit details
    Browse the repository at this point in the history

  11. ci(buildkit): remove regex skipping tests with digest inconsistency 

    Skipping digest-related tests is no longer necessary after containerd/containerd@4065831

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
    @crazy-max @neersighted
    crazy-max authored and neersighted committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    d5b067e View commit details
    Browse the repository at this point in the history