Commit Graph

1833 Commits (5941bf049480ec2d585d9af142810b0f6915290b)
 

Author SHA1 Message Date
CrazyMax 120f3a8918
bake: ignore profiles in compose definitions
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax bd672eaf5b
Merge pull request from crazy-max/docker-local
build: prefer local image resolution for docker driver
CrazyMax c2500ea2d8
build: prefer local image resolution for docker driver
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Justin Chadwell a4663b4b2e
Merge pull request from cyphar/build-go_extra_flags
Aleksa Sarai 57c618b83a
build: add GO_EXTRA_FLAGS argument
This is useful for setting things like -buildmode=pie when packaging
docker-buildx for distributions.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
CrazyMax b3a4f95110
Merge pull request from crazy-max/test-containerd-snap
test: register docker worker with containerd snapshotter
CrazyMax 28a1eb3527
test: fix testImageIDOutput
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax 75ecc15958
test: fix inspect and ls
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax 2235ebce2f
test: register docker worker with containerd snapshotter
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax 7147463418
dockerfile: update docker to 24.0.2
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Justin Chadwell 010e4c8d54
Merge pull request from jedevc/tests-share-docker-container-backend
Justin Chadwell 6f394a0691 tests: set a dedicated buildx config dir for each worker
This should help reduce any unexpected config conflict between workers.

Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell efd7279118 ci: run docker-container tests in parallel
Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell 601056f3a7 tests: share single docker between docker-container backends
This means that we can run our docker-container tests in parallel again,
which can help speed up our test runs by a *significant* amount.

Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell 0a7f96cbfb vendor: update buildkit to master@2d91ddcceedc
Signed-off-by: Justin Chadwell <me@jedevc.com>
CrazyMax 1c530c2fe0
Merge pull request from dvdksn/docs/add-experimental-debugmonitor
docs: add experimental annotation for debug-shell command
David Karlsson 1e576dd7c6 chore: make docs
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
CrazyMax 7a5472153b
docs: set experimental annotation
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Dmitry Makovey b986ce566b Add Bearer token
Signed-off-by: Dmitry Makovey <dmakovey@gitlab.com>
CrazyMax daba16f4be
Merge pull request from crazy-max/fix-ctx-validation
builder: skip name validation for docker context
CrazyMax ee36e2264e
Merge pull request from jedevc/fix-dockerfile-cwd-join
bake: fix incorrect dockerfile resolution against `cwd://` context
CrazyMax 329e98d9f0
Merge pull request from docker/dependabot/github_actions/peter-evans/create-pull-request-5.0.2
build(deps): Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2
dependabot[bot] f4513f7028
build(deps): Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](284f54f989...153407881e)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
CrazyMax b1c5449428
builder: skip name validation for docker context
Although a builder from the store cannot be created unless
it has a valid name, this is not the case for a Docker context.

We should skip name validation when checking a node from the
store and fall back to finding one from Docker context instead.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Justin Chadwell 431732f5d1 bake: fix incorrect dockerfile resolution against cwd:// context
We need to resolve the strip the cwd:// prefix before attempting to
resolve the dockerfile. Otherwise, we'll get the cwd:// prefix in the
dockerfile name, which isn't stripped out later.

Signed-off-by: Justin Chadwell <me@jedevc.com>
CrazyMax 687feca9e8
Merge pull request from jedevc/cache-dockerutil-features
dockerutil: cache feature collection
Justin Chadwell d4a2c8d0c3 dockerutil: cache feature collection
Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell bef42b2441
Merge pull request from tonistiigi/remove-history-request
CrazyMax 2de333fdd3
check history api support once
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Tonis Tiigi 1138789f20
avoid extra client for history API detection
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Justin Chadwell 1f4ac09ffb
Merge pull request from thaJeztah/bump_engine_24.0.2
CrazyMax 26a8ffb393
Merge pull request from jedevc/vendor-buildkit-master
vendor: update buildkit to master@67a08623b95a
CrazyMax 9b7aada99b
Merge pull request from distorhead/use-docker-cli-in-stream
build(cli): allow passing in-stream using command.Cli
Sebastiaan van Stijn fd6207695b
vendor: github.com/docker/cli v24.0.2
no changes in vendored files

full diff: https://github.com/docker/cli/compare/v24.0.1...v24.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn def96d2bf4
vendor: github.com/docker/docker v24.0.2
no changes in vendored files

full diff: https://github.com/docker/docker/compare/v24.0.1...v24.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Justin Chadwell f5f00e68ef bake(cli): allow passing in-stream using command.Cli
ReadLocalFiles should allow passing the stdin file as an argument, which
allows us to read from dockerCli.Stdin() to be consistent with other
commands in the same package.

Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell 14aebe713e debug-shell(cli): allow passing in-stream using command.Cli
Signed-off-by: Justin Chadwell <me@jedevc.com>
Justin Chadwell 9d2388e6f5 vendor: update buildkit to master@67a08623b95a
Signed-off-by: Justin Chadwell <me@jedevc.com>
Timofey Kirillov 75e2c46295
build(cli): allow passing in-stream using command.Cli
Use command.Cli::In() which is always initialized either to os.Stdin, or to user-specified stream:
* 5be21394cb/cli/command/cli.go (L494)
* https://github.com/docker/cli/blob/master/cli/command/cli_options.go#L16C1-L26

Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
Justin Chadwell 2c02db8db4
Merge pull request from ktock/long-form-json
Kohei Tokunaga e304a05d2a docs: monitor: mention about long form flag
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
Kohei Tokunaga 14c1ea0e11 invoke: Allow JSON array for long form flags
This commit allows specifying a JSON array to the long-form arg, entrypoint and
envvars.
Non-JSON-array value can still be specified. Buildx treats the value as a JSON
array only when it can be parsed as a JSON array.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
Justin Chadwell c30bcade2c
Merge pull request from tianon/invoke-entrypoint-fixes
Tianon Gravi 62bfb19db4 Fix a couple `--invoke` entrypoint interaction bugs
When running `--invoke` against images that have `Cmd` set, the interactions with `Entrypoint` start to cause issues like the following:

    /usr/local/bin/bash: /usr/local/bin/bash: cannot execute binary file

Or:

    sh: can't open 'bash': No such file or directory

This patch fixes those by explicitly setting `Cmd` to be empty if it is unspecified and `Entrypoint` is being set, which matches `docker`'s behavior:

    $ docker image inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' bash
    ["docker-entrypoint.sh"] + ["bash"]
    $ docker create --name foo --entrypoint bash bash
    $ docker container inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' foo
    ["bash"] + null
    $ docker rm foo
    $ docker create --name foo bash ls
    $ docker container inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' foo
    ["docker-entrypoint.sh"] + ["ls"]

(There are still some weird edge cases in the interaction between the `InvokeConfig` and the original image config, but this fixes the most irritating for me and the rest are going to be deeper changes that are possibly less acceptable. 😅)

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Justin Chadwell 47e34f2684
Merge pull request from jedevc/oci-export-on-containerd
Justin Chadwell 3d981be4ad
Merge pull request from ktock/monitor-longhelp
CrazyMax 5d94b0fcc7
Merge pull request from crazy-max/bump-compose
vendor: github.com/compose-spec/compose-go v1.14.0
CrazyMax 569c66fb62
Merge pull request from crazy-max/bump-testify
vendor: github.com/stretchr/testify v1.8.4
CrazyMax 93f7fbdd78
Merge pull request from crazy-max/bump-semver
vendor: github.com/Masterminds/semver/v3 v3.2.1
Tõnis Tiigi ea06685c11
Merge pull request from potherca-contrib/fix/typo-Shortand
Fix typo "Shortand" -> "Shorthand"