Commit Graph

3020 Commits (a743d4ba02bb9f5b24078988f6f20401e5af043d)

Author SHA1 Message Date
Tõnis Tiigi 25bd56b3b5
Merge pull request #1985 from cpuguy83/dockerfile_multiplat_opt
Support BUILDKIT_MULTI_PLATFORM arg in Dockerfile
2021-02-17 21:06:51 -08:00
Brian Goff adf8f25aa2 Support BUILDKIT_MULTI_PLATFORM arg in Dockerfile
This sets the platform prefix based on the `BUILDKIT_MULTI_PLATFORM`
value (if set).  This is similar to the changes here in
docker/buildx@7f58ad45fa

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-02-17 21:47:04 +00:00
Akihiro Suda 7f26b0512d
Merge pull request #1979 from robtaylor/master
Update buildkitd.toml.md
2021-02-16 15:05:08 +09:00
Rob Taylor fd8e32debc Update buildkitd.toml.md
gckeepstorage is in MB, not bytes.

Signed-off-by: Rob Taylor <robtaylor@floopily.org>
2021-02-13 13:31:10 +00:00
Akihiro Suda 7641cbf961
Merge pull request #1975 from tonistiigi/update-testify 2021-02-09 03:10:14 +09:00
Tonis Tiigi f5962fca5e vendor: update testify
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-07 16:40:35 -08:00
Tõnis Tiigi 58038e6371
Merge pull request #1966 from thaJeztah/master_apparmor
[master] Add support for apparmor/selinux
2021-02-05 09:25:33 -08:00
Tõnis Tiigi 9bb4fa53b1
Merge pull request #1954 from thaJeztah/dockerfile_export_flags_used
frontend/dockerfile: add RunCommand.FlagsUsed field
2021-02-04 13:04:44 -08:00
Brian Goff d9834f872c
Add support for apparmor/selinux
Set's an apparmor profile on the OCI spec if one is configred on the
worker.
Adds selinux labels to containers (only added if selinux is enabled on
the system).

This assumes that the specified apparmor profile is already loaded on
the system and does not try to load it or even check if it is loaded.

SELinux support requires the `selinux` build tag to be added.
Likewise, `runc` would require both the `apparmor` and `selinux` build
tags.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Vendored go-selinux to v1.8.0
Fixed tests

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 68bb095353)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-02-04 22:01:34 +01:00
Akihiro Suda d5579348b8
Merge pull request #1965 from tonistiigi/fileop-cache-fix 2021-02-05 01:29:44 +09:00
Tonis Tiigi 8d70777537 fileop: fix checksum to contain indexes of inputs
Cache mismatch can happen if fileop switches input indexes
between different actions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-03 22:17:57 -08:00
Tonis Tiigi 42fb2a8771 avoid double release of same ref released multiple times
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-03 10:53:19 -08:00
Tonis Tiigi b4b0ece384 make sure result refs returned in errors are clone
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-03 10:49:38 -08:00
Tonis Tiigi 3660e5f9c8 don't commit cache mounts on error
Cache mount instances are shared between multiple vertextes/builds
so if one of the cloned instance gets committed reference count
will get corrupted as other parts of the code still see reference as
mountable.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-02 23:20:44 -08:00
Tõnis Tiigi 91e19efba2
Merge pull request #1959 from wanghuaiqing2010/master
add support for mips64el and mips64
2021-02-02 14:47:05 -08:00
zhangwenlong 7cd6a5feaf add support for mips64el and mips64
Signed-off-by: zhangwenlong <zhangwenlong8911@163.com>
2021-02-02 10:54:17 +08:00
Akihiro Suda 6b9ea0c202
Merge pull request #1957 from tonistiigi/resolver-err-sync
resolver: avoid error caching on token fetch
2021-01-29 15:53:03 +09:00
Tonis Tiigi 3a2c03052f resolver: avoid error caching on token fetch
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-01-28 00:37:31 -08:00
Akihiro Suda 96bd77e766
Merge pull request #1955 from tonistiigi/armhf-seccomp-fix
fix seccomp compatibility in 32bit arm
2021-01-28 14:17:34 +09:00
Sebastiaan van Stijn ebed917e43
frontend/dockerfile: add RunCommand.FlagsUsed field
The FlagsUsed contains a list of flags that were used, which allows the classic
(non-buildkit) builder in dockerd to produce an error when non-supported options
are used in a Dockerfile.

This is a short-term solution; a more permanent solution will be to keep track
of which version of the Dockerfile syntax is supported, and to have the classic
builder pass the maximum supported version of the syntax.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-01-27 13:34:12 +01:00
Tonis Tiigi 1fd4c49605 fix seccomp compatibility in 32bit arm
Seccomp 2.4.2 is needed for new time64 syscalls not to error in
applications

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-01-26 11:35:03 -08:00
Akihiro Suda 40cf375d0b
Merge pull request #1953 from tonistiigi/binfmt-update
update qemu emulators
2021-01-22 17:53:10 +09:00
Tonis Tiigi dae8f156da update qemu emulators
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-01-21 18:33:00 -08:00
Tõnis Tiigi 5568cd7375
Merge pull request #1950 from ktock/bump-ss030
Bump github.com/containerd/stargz-snapshotter to v0.3.0
2021-01-21 09:21:48 -08:00
ktock db794baea7 Bump github.com/containerd/stargz-snapshotter to v0.3.0
Signed-off-by: ktock <ktokunaga.mail@gmail.com>
2021-01-21 18:27:01 +09:00
Akihiro Suda e48badbfb2
Merge pull request #1934 from tonistiigi/clip-fix
logs: fix clipping configuration
2021-01-14 16:10:39 +09:00
Tonis Tiigi f3e6120a6b logs: increase default allowed log size
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-01-05 21:31:20 -08:00
Tonis Tiigi 18821ec794 logs: fix clipping configuration
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-01-05 21:30:22 -08:00
Tõnis Tiigi 08e901325b
Merge pull request #1901 from alexcb/check-for-explicit-ssh-prefix
Check for explicit ssh git URL
2021-01-04 13:21:24 -08:00
Alex Couture-Beil 3a5bdf0710 Move prefix check to isGitTransport
- rename IsSSHTransport to IsImplicitSSHTransport
- add testing for NewGitIdentifier

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2021-01-04 11:09:56 -08:00
Tõnis Tiigi 5efd74b6c0
Merge pull request #1924 from afbjorklund/addr-fd
Add support for fd:// for socket activation
2020-12-30 10:58:04 -08:00
Anders F Björklund 0028c5ed7f Add support for fd:// for socket activation
Used go-systemd code from moby/moby daemon

Only added `buildkitd --addr fd://` for now.

Don't do systemd fds for windows buildkitd

Add buildkit systemd units README/examples

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2020-12-30 16:57:23 +01:00
Tõnis Tiigi a34d3b929c
Merge pull request #1925 from crazy-max/fix-buildx-image-workflow
Fix buildx-image workflow
2020-12-28 22:12:32 -08:00
CrazyMax bb1dcdad51
Fix buildx-image workflow
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2020-12-29 01:49:03 +01:00
Tõnis Tiigi 1c378111a7
Merge pull request #1912 from crazy-max/buildx-image
Dispatch workflow for buildx image
2020-12-28 16:36:57 -08:00
Tõnis Tiigi dd7fe19951
Merge pull request #1830 from coryb/unknown-exit-status
move UnknownExitStatus to executor package from errdefs
2020-12-28 16:35:14 -08:00
CrazyMax c64a76ac91
Dispatch workflow for buildx image
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2020-12-28 21:51:41 +01:00
Tõnis Tiigi 2f4c15df6f
Merge pull request #1908 from AkihiroSuda/esgz-20201218
bump up stargz-snapshotter
2020-12-28 12:13:46 -08:00
Tõnis Tiigi 40fcf49b20
Merge pull request #1910 from AkihiroSuda/remove-unused-comparewithparent
cache: remove unused CompareWithParent interface
2020-12-28 12:09:43 -08:00
Sebastiaan van Stijn b21e79cefd
Merge pull request #1916 from tiborvass/syntax_dockerfile_1.2
dockerfile/docs: fix frontend image tags
2020-12-23 13:15:09 +01:00
Tibor Vass 1218e37c23 dockerfile/docs: fix frontend image tags
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-12-20 23:24:04 +00:00
Akihiro Suda d039647ea2
cache: remove unused CompareWithParent interface
CompareWithParent is not used in the current code.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-18 18:03:14 +09:00
Akihiro Suda 59880bef10
bump up stargz-snapshotter
The git repo of github.com/containerd/stargz-snapshotter now has two go.mod modules:
- github.com/containerd/stargz-snapshotter
- github.com/containerd/stargz-snapshotter/estargz

So we need to have the following `replace` directive in `go.mod`:
```
github.com/containerd/stargz-snapshotter/estargz => github.com/containerd/stargz-snapshotter/estargz <VERSION>
```

Otherwise `go mod tidy` fails with the following error:
```
go: github.com/containerd/stargz-snapshotter@v0.2.1-0.20201217071531-2b97b583765b requires
        github.com/containerd/stargz-snapshotter/estargz@v0.0.0-00010101000000-000000000000: invalid version: unknown revision 000000000000
```

ref: https://github.com/containerd/stargz-snapshotter/pull/195

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-18 14:59:10 +09:00
Tõnis Tiigi b75c05157d
Merge pull request #1847 from AkihiroSuda/hack-remove-non-buildx
hack/util: install buildx when not installed
2020-12-16 11:57:05 -08:00
Akihiro Suda 201ba2b0e3
hack: install buildx in util
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-16 17:31:17 +09:00
Akihiro Suda 97b0904bcd
hack/util: disallow using DOCKER_BUILDKIT instead of buildx
DOCKER_BUILDKIT CLI is slightly different from buildx.
It is hard to maintain DOCKER_BUILDKIT as a buildx alternative.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-12-16 17:28:46 +09:00
Alex Couture-Beil 0dff0fdab4 Check for explicit ssh git URL
- fix IsSSHTransport to also check for explicitly-defined ssh-based git repos

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-12-15 13:31:35 -08:00
Tõnis Tiigi 7880a4ea24
Merge pull request #1885 from ktock/bump-ss2
Bump github.com/containerd/stargz-snapshotter to v0.2.0
2020-12-15 08:36:11 -08:00
Akihiro Suda 22113880db
Merge pull request #1899 from tiborvass/dockerfile-readme-nit
docs: Change buildkit 0.8.0 -> 0.8.1 and an instance of dockerfile 1.2.0 to 1.2
2020-12-15 15:01:48 +09:00
Tibor Vass 40a36f455f docs: Change buildkit 0.8.0 -> 0.8.1 and an instance of dockerfile 1.2.0 to 1.2
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-12-15 05:34:11 +00:00