alextab93/buildx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
1,778 Commits 1 Branch 1 Tag
b8739d74417f86aa8fc9aafb830a8ba656bdef0e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin ChadwellandGitHub b8739d7441 Merge pull request #1934 from jedevc/use-buildkit-client-wait 2023-07-19 16:23:54 +01:00
Justin ChadwellandGitHub 23fe02993b Merge pull request #1963 from jedevc/split-to-driver-pairs-fix-type 2023-07-19 15:57:43 +01:00
Justin Chadwell 1d177f00d2 chore: tidy splitToDriverPairs to avoid unneccessary int 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-07-19 14:43:50 +01:00
Justin Chadwell e11c5e3e96 remote: use buildkit's client.Wait method to bootstrap 
This native implementation uses GRPC level waiting, instead of starting
a busy loop. We also a manual max backoff of one second to improve
responsiveness.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-07-19 12:39:19 +01:00
Justin ChadwellandGitHub e98e8f6ac9 Merge pull request #1948 from thaJeztah/buildkit_0.12 2023-07-18 15:05:18 +01:00
Justin ChadwellandGitHub 7c3b77fb36 Merge pull request #1950 from thaJeztah/remove_imageutil_dead_code 2023-07-17 12:26:05 +01:00
Justin ChadwellandGitHub 068382f5df Merge pull request #1936 from jedevc/hack-set-go-version-to-1.20.5 2023-07-12 14:49:59 +01:00
Justin Chadwell c4bec05466 hack: force go version to 1.20.5 
A temporary workaround for "http: invalid Host header" introduced in
go 1.20.6.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-07-12 14:31:23 +01:00
Justin ChadwellandGitHub b84e0e11b4 Merge pull request #1918 from crazy-max/docs-hidden-fix 2023-07-03 11:50:04 +01:00
Justin ChadwellandGitHub d95f5f8f3b Merge pull request #1925 from dvdksn/test/build-progress 2023-07-03 10:48:52 +01:00
Justin ChadwellandGitHub cf9798cede Merge pull request #1919 from crazy-max/fix-build-details-link 2023-06-30 13:51:23 +01:00
Justin ChadwellandGitHub 2eba60db75 Merge pull request #1916 from jedevc/add-local-bake-test 2023-06-27 11:28:47 +01:00
Justin Chadwell 0dcbed3f53 tests: add simple local bake test 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-27 11:16:44 +01:00
Justin ChadwellandGitHub a4663b4b2e Merge pull request #1900 from cyphar/build-go_extra_flags 2023-06-21 09:59:19 +01:00
Justin ChadwellandGitHub 010e4c8d54 Merge pull request #1890 from jedevc/tests-share-docker-container-backend 2023-06-20 14:24:09 +01:00
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>
 2023-06-20 12:40:45 +01:00
Justin Chadwell efd7279118 ci: run docker-container tests in parallel 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-20 12:28:51 +01:00
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>
 2023-06-20 12:28:49 +01:00
Justin Chadwell 0a7f96cbfb vendor: update buildkit to master@2d91ddcceedc 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-20 12:27:46 +01:00
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>
 2023-06-14 12:18:53 +01:00
Justin Chadwell d4a2c8d0c3 dockerutil: cache feature collection 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-13 09:47:38 +01:00
Justin ChadwellandGitHub bef42b2441 Merge pull request #1876 from tonistiigi/remove-history-request 2023-06-13 09:38:05 +01:00
Justin ChadwellandGitHub 1f4ac09ffb Merge pull request #1874 from thaJeztah/bump_engine_24.0.2 2023-06-09 11:39:13 +01:00
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>
 2023-06-09 10:50:53 +01:00
Justin Chadwell 14aebe713e debug-shell(cli): allow passing in-stream using command.Cli 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-09 10:50:35 +01:00
Justin Chadwell 9d2388e6f5 vendor: update buildkit to master@67a08623b95a 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-09 10:36:52 +01:00
Justin ChadwellandGitHub 2c02db8db4 Merge pull request #1835 from ktock/long-form-json 2023-06-08 17:10:37 +01:00
Justin ChadwellandGitHub c30bcade2c Merge pull request #1870 from tianon/invoke-entrypoint-fixes 2023-06-08 16:03:24 +01:00
Justin ChadwellandGitHub 47e34f2684 Merge pull request #1813 from jedevc/oci-export-on-containerd 2023-06-07 15:19:54 +02:00
Justin ChadwellandGitHub 3d981be4ad Merge pull request #1850 from ktock/monitor-longhelp 2023-06-07 15:09:35 +02:00
Justin ChadwellandGitHub 696770d29c Merge pull request #1840 from jedevc/fix-check-path-for-bake-cmd-context 2023-06-06 17:49:04 +02:00
Justin Chadwell d34103b0d9 bake: fix potential context entitlements escape 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:17:03 +02:00
Justin Chadwell c820350b5e tests: refactor cmd helpers to allow configuring cwd, etc 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:17:03 +02:00
Justin Chadwell 61a7854659 tests: add bake test for remote subdir context 
Fixed in 12b6a3ad9a, but now we have
regression tests! So we can add a check that we don't break this
behavior again.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin Chadwell e859ebc12e tests: add bake test for remote cmd context override 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin Chadwell ef997fd6d0 bake: fix BAKE_CMD_CONTEXT relative path resolution 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin Chadwell 76c96347ff tests: add basic remote bake context test 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin Chadwell 48d7dafbd5 git: update gitutil test utilities 
- Adds a new GitServeHTTP function to start an http server to serve a
  target git repository.
- Adds a new GitDir helper method to get the path to the .git
  directory
- Updates the GitAdd method to take a variable number of files

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin Chadwell d03e93f6f1 test: tmpdir can be a test helper 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 17:15:19 +02:00
Justin ChadwellandGitHub fcb7810a38 Merge pull request #1854 from crazy-max/inspect-features 2023-06-06 16:59:58 +02:00
Justin ChadwellandGitHub 7cef021a8a Merge pull request #1804 from jedevc/fixup-solve 2023-06-06 09:12:10 +02:00
Justin Chadwell c6db4cf342 build: clarify NewResultHandle comment 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-06 09:08:30 +02:00
Justin ChadwellandGitHub a906149930 Merge pull request #1862 from jedevc/update-contributing-tests 
docs: update CONTRIBUTING.md with specific test notes
 2023-06-01 21:55:12 +01:00
Justin Chadwell af328fe413 docs: update CONTRIBUTING.md with specific test notes 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-06-01 11:34:20 +01:00
Justin Chadwell 183a73abae build: docker exporter should instead use oci with containerd 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-31 15:59:55 +01:00
Justin Chadwell b7f0b3d763 build: clear exports for secondary solve request 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-31 15:13:56 +01:00
Justin Chadwell 5b27d5a9f6 build: cleanup res if returned in basic build 
In practice, this shouldn't happen, but the check is good to include
anyways.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-31 15:13:03 +01:00
Justin Chadwell cd1648192e build: rename ResultContext to ResultHandle 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-31 09:50:46 +01:00
Justin Chadwell 8d822fb06c build: move main solve request into main gateway call 
Now, we always perform the full solve request in the main gateway call.
This ensures that progress works properly, and makes the lifetime
semantics much clearer.

NewResultContext abstracts the details of a successful/failed build, to
always return a single ResultContext, even though the details of how a
gateway is created is different:
- For a failed build, we can just keep the gateway open.
- For a successful build, we immediately open another gateway and
  re-evaluate the build definition in that gateway. This should give an
  instant cache hit (since the build was just successful).

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-31 09:46:46 +01:00
Justin ChadwellandGitHub 5e2f8bd64a Merge pull request #1853 from jedevc/logrus-show-error 2023-05-30 10:29:49 +01:00
Justin Chadwell 5788ab33d2 logutil: print error from WithError if found 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-30 10:00:24 +01:00
Justin Chadwell 6c62225d1b vendor: update buildkit to master@c36941f4a10e 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-30 09:10:52 +01:00
Justin Chadwell 2dae553d18 build: update outline fallback image 
Subrequests have been included in docker/dockerfile:1.5 labs, so we can
update the fallback to point to this release.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-26 10:38:38 +01:00
Justin Chadwell 91c17f25fb build: tidy up print func 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-26 10:38:38 +01:00
Justin ChadwellandGitHub 354ccc9469 Merge pull request #1844 from tonistiigi/imageid-fixes 2023-05-26 10:21:53 +01:00
Justin ChadwellandGitHub 341fb65f6f Merge pull request #1830 from jedevc/fix-missing-driver-in-build 2023-05-25 11:35:01 +01:00
Justin ChadwellandGitHub 69a9c6609a Merge pull request #1699 from jedevc/bake-attestation-override 2023-05-25 09:54:34 +01:00
Justin Chadwell c77bd8a578 build: fix missing "docker" driver name in build progress 
This was missing, since the driver property can only be fully populated
after loading nodes from disk. So we add logic to load the nodes, and
check for an error, which ensures that the "docker" driver is always
correctly present in the progress description.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-23 10:37:22 +01:00
Justin ChadwellandGitHub e5f701351c Merge pull request #1829 from jedevc/vendor-buildkit-master 2023-05-23 10:23:24 +01:00
Justin Chadwell 09798cdebd vendor: update buildkit to master@212ab16a39b1 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-23 10:16:09 +01:00
Justin ChadwellandGitHub 7e39644f69 Merge pull request #1816 from bpaquet/fix_session_token 2023-05-22 09:34:07 +01:00
Justin Chadwell f558fd8b22 vendor: use docker/distribution instead of distribution/distribution 
This doesn't require pulling in a new direct dependency, we already use
docker/distribution throughout imagetools and build.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-22 09:24:41 +01:00
Justin ChadwellandGitHub 432e16ef70 Merge pull request #1806 from thaJeztah/update_engine2 2023-05-22 09:19:35 +01:00
Justin ChadwellandGitHub 4429ccbcc2 Merge pull request #1817 from jedevc/docs-monitor-invoke-parts 2023-05-19 16:40:47 +01:00
Justin ChadwellandGitHub c59fc18325 Merge pull request #1770 from jedevc/integration-tests 2023-05-19 16:18:31 +01:00
Justin Chadwell 4ce80856b3 docs: add info for on-error and debug-shell values for invoke 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-19 14:51:51 +01:00
Justin Chadwell af3feec4ea docs: fixup typo in buildkit console output 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-19 14:51:30 +01:00
Justin Chadwell 90c849f5ef bake: merge attest entries 
This ensures that `target.attest=["type=sbom,<value>"]` can be
appropriately merged when `--sbom=true` or `--set
target.attest=type=sbom`.

To merge, we simply naively take the last valid value.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-19 14:32:58 +01:00
Justin Chadwell 6024212ac8 ci: add integration tests 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-18 14:26:12 +01:00
Justin Chadwell 2d124e0ce9 test: add basic integration tests 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-18 14:26:12 +01:00
Justin Chadwell e61a8cf637 vendor: update buildkit to master@31c870e82a48 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-18 14:25:31 +01:00
Justin ChadwellandGitHub 167cd16acb Merge pull request #1797 from crazy-max/fix-image-create 2023-05-18 09:06:45 +01:00
Justin ChadwellandGitHub 060ac842bb Merge pull request #1794 from jedevc/fix-printer-start-race 2023-05-12 09:43:58 +01:00
Justin ChadwellandGitHub 31d1b778ff Merge pull request #1795 from thaJeztah/vendor_distribution_v2.8.2 2023-05-12 09:43:07 +01:00
Justin ChadwellandGitHub 10aea8e970 Merge pull request #1791 from jedevc/docs/bake-reference-matrix 
Document new bake matrix builds
 2023-05-11 15:43:49 +01:00
Justin Chadwell be6542911f progress: make printer ready only after pausing logrus 
This fixes a possible race where messages printed directly after calls
to NewPrinter may appear before the printer starts. With this change, we
delay all of the logs until after.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 15:23:41 +01:00
Justin Chadwell 9ee19520dd controller: move path resolution into controller package 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 13:56:05 +01:00
Justin ChadwellandDavid Karlsson <david.karlsson@docker.com 878faae332 docs: add matrix docs for bake 
Co-authored-by: David Karlsson <david.karlsson@docker.com
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 13:44:28 +01:00
Justin Chadwell eaf38570e7 github: don't auto-add kind/bug labels 
kind labels should only be manually added by maintainers after
confirming the issue. Otherwise, it can be tricky to sort through all
the issues when filtering for legitimate bugs.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 13:43:25 +01:00
Justin ChadwellandGitHub e61a1da7fc Merge pull request #1748 from dvdksn/docs/bake-reference 
docs: move and rewrite bake reference
 2023-05-11 13:00:21 +01:00
Justin ChadwellandGitHub 2c8a9aad76 Merge pull request #1782 from jedevc/docs-monitor 
docs: add initial guide about debugging monitor mode
 2023-05-11 11:29:21 +01:00
Justin ChadwellandGitHub 32009a701c Merge pull request #1786 from jedevc/debug-multi-platform 
debug: evaluate all refs to allow multi-platform debugging
 2023-05-11 09:54:13 +01:00
Justin Chadwell 0cbc316f76 docs: add initial guide about debugging monitor mode 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 09:53:21 +01:00
Justin Chadwell 45fccef3f3 debug: evaluate all refs to allow multi-platform debugging 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-11 09:44:50 +01:00
Justin ChadwellandGitHub fdcb4e2fb9 Merge pull request #1784 from jedevc/support-new-compose-features 
Support new compose features in bake
 2023-05-11 09:44:02 +01:00
Justin ChadwellandGitHub 4a0a67d7a2 Merge pull request #1783 from jedevc/fix-bake-sub-dir-context 
bake: copy remote context contents to root
 2023-05-11 09:40:25 +01:00
Justin ChadwellandGitHub 2eeef180ea Merge pull request #1746 from ktock/resultcleanup 
controller: avoid "context canceled" error on cleanup
 2023-05-10 13:24:12 +01:00
Justin ChadwellandGitHub 1eb9ad979e Merge pull request #1785 from jedevc/default-to-local-controller 
controller: default to using local controller
 2023-05-10 11:18:55 +01:00
Justin Chadwell 77e0e860f8 controller: default to using local controller 
--detach shouldn't be the default yet, since it still has the potential
to leak some sessions in odd edge cases, and is slightly more painful to
debug.

For now, we should set the local controller as the default, with the
idea that we can change it back in the future.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-10 09:51:58 +01:00
Justin Chadwell e228c398f4 bake: support compose additional contexts 
compose-go v1.13.0 supports the new additional_contexts to allow passing
additional build context during build, so we should map this to bake's
contexts property.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-10 09:41:37 +01:00
Justin Chadwell 5d06406f26 bake: support compose inline dockerfile 
compose-go v1.13.0 supports the new dockerfile_inline to allow including
a dockerfile inline in the compose definition, so we should map this to
bake's dockerfile-inline property.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-10 09:39:00 +01:00
Justin ChadwellandGitHub cb061b684c Merge pull request #1753 from nicksieger/compose-go-v1.13.4 
compose go v1.13.4
 2023-05-10 09:25:10 +01:00
Justin Chadwell 12b6a3ad9a bake: copy remote context contents to root 
When resolving remote contexts locally in bake, then we need to ensure
that we properly unpack the contents of that context to the root
directory, instead of leaving it in the subdirectory.

Otherwise, any files will be found in the wrong location. Along with
this change, we also need a change to the dockerfile location lookup to
ensure that it is found at the root instead of in the subdirectory.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-09 17:19:26 +01:00
Justin Chadwell 22e1901581 bake: reorganize input creation together 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-09 17:15:44 +01:00
Justin ChadwellandGitHub e23c37fa96 Merge pull request #1771 from jedevc/unset-other-build-client-opt 
debug: secondary client build should not reuse solve opts
 2023-05-09 14:57:23 +01:00
Justin Chadwell e5a0ed1149 debug: secondary client build should not reuse solve opt ref 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2023-05-09 14:23:41 +01:00
Justin ChadwellandGitHub c9c1303e31 Merge pull request #1777 from ktock/fixerrormsg 
monitor: improve error messages
 2023-05-09 13:49:07 +01:00
Justin ChadwellandGitHub ae3299d9d4 Merge pull request #1628 from cpuguy83/policy_file 
Support for passing through raw buildkit policies
 2023-05-09 11:50:10 +01:00
Justin ChadwellandGitHub 7ad970f93a Merge pull request #1776 from tonistiigi/fix-conn-leak 
docker: fix connection leak on features check
 2023-05-09 09:52:18 +01:00
Justin ChadwellandGitHub c7c37c3591 Merge pull request #1760 from ktock/monitor-commands 
monitor: Move commands to a separated package
 2023-05-03 14:33:08 +01:00