Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Acb/earthly main #54

Merged
merged 316 commits into from
Oct 28, 2021
Merged

Acb/earthly main #54

merged 316 commits into from
Oct 28, 2021

Conversation

alexcb
Copy link

@alexcb alexcb commented Oct 28, 2021

This attempts to keep a reference to our old earthly-main branch even though the diffs were pulled out and saved as a single-commit rebased off moby/master.

git checkout acb/manual-rebase
git merge -s ours earthly/earthly-main
git checkout -b acb/earthly-main

tonistiigi and others added 30 commits June 18, 2021 10:09
replace uses of deprecated containerd/sys.RunningInUserNS()
integration: add common context base to all integration tests
Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit bc9a83144c83e9fd78007b7bfe92e8082c59d40e)
Hopefully this can be removed with a future upstream change
that could make this configurable. The package also needs
internal dependency that is copied in.

Signed-off-by: Tonis Tiigi <[email protected]>
Avoid client package having dependency on global detect package.

Signed-off-by: Tonis Tiigi <[email protected]>
 Dockerfile: install fuse-overlayfs from apk
Fix this panic when copying from an image with no layers:

```
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x50 pc=0xdd8c17]

goroutine 326 [running]:
github.com/moby/buildkit/cache/contenthash.(*cacheManager).Checksum(0xc0005ec030, 0x1682c00, 0xc000842140, 0x0, 0x0, 0xc0005d4023, 0x1, 0x0, 0x0, 0x0, ...)
	/src/cache/contenthash/checksum.go:95 +0x37
github.com/moby/buildkit/cache/contenthash.Checksum(0x1682c00, 0xc000842140, 0x0, 0x0, 0xc0005d4023, 0x1, 0x0, 0x0, 0x0, 0x0, ...)
	/src/cache/contenthash/checksum.go:59 +0xd5
github.com/moby/buildkit/solver/llbsolver.NewContentHashFunc.func1.1(0x0, 0x4425d6)
	/src/solver/llbsolver/result.go:59 +0x20a
golang.org/x/sync/errgroup.(*Group).Go.func1(0xc00056a360, 0xc000594510)
	/src/vendor/golang.org/x/sync/errgroup/errgroup.go:57 +0x59
created by golang.org/x/sync/errgroup.(*Group).Go
	/src/vendor/golang.org/x/sync/errgroup/errgroup.go:54 +0x66
```

When the path is "/", we allow it because it's a noop.

Based on moby#2185

Signed-off-by: Aaron Lehmann <[email protected]>
llb: ensure meta resolver uses platform form constraints
Avoid nil pointer dereference when copying from image with no layers
ensure containerd io is complete and closed before returning
flightcontrol: reduce contention between goroutines
jgiannuzzi and others added 22 commits September 21, 2021 15:57
Signed-off-by: Jonathan Giannuzzi <[email protected]>
Add BUILDKIT_SANDBOX_HOSTNAME build-arg
Currently, eStargz compression doesn't preserve the original tar metadata
(header bytes and their order). This causes failure of `TestGetRemote` because
an uncompressed blob converted from a gzip blob provides different digset
against the one converted from eStargz blob even if their original tar (computed
by differ) are the same.
This commit solves this issue by fixing eStargz to preserve original tar's
metadata that is modified by eStargz.

Signed-off-by: Kohei Tokunaga <[email protected]>
Fix estargz compression loses the original tar metadata
Fix flakiness during import of a cache with empty layers removed
Enhance ANSI colors for progress ui
Move resolver config to a dedicated package
Standard user umask for git process
make sure ci runs on version branches
return an error instead of panicking when failing to get edge
This commit squashes previous work done in the earthly-main branch
199ad6a into a single commit
which is rebased against moby/master branch d429b0b
@alexcb alexcb merged commit 3161e25 into earthly-main Oct 28, 2021
@alexcb alexcb deleted the acb/earthly-main branch October 28, 2021 19:51
@alexcb alexcb restored the acb/earthly-main branch October 28, 2021 19:58
@alexcb alexcb deleted the acb/earthly-main branch October 28, 2021 20:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.