Commit Graph

385 Commits (489e17aea91829a4ada48cb09e1119606802dc5e)

Author SHA1 Message Date
Tõnis Tiigi 75f3315583
Merge pull request #2017 from AkihiroSuda/containerd-15
Dockerfile: update containerd to v1.5.0-rc.2 / v1.4.4
2021-04-26 16:31:08 -07:00
Corey Larson 9b7a5fc618 Remove potentially expired tokens.
Some registries (notably Quay) issue tokens that expire without providing an `expires in` value in the authorization payload. Therefore, if a token produces a 401, we should remove it and re-fetch.

Signed-off-by: Corey Larson <corey@earthly.dev>
2021-04-21 14:13:58 -06:00
Akihiro Suda 19fd8ca54f
go.mod: containerd v1.5.0-rc.2
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-04-21 03:43:35 +09:00
Tõnis Tiigi 33b56587e9
Merge pull request #2069 from AkihiroSuda/carry-2001
[Carry 2001] Dockerfile: update containerd to 1.4.3  + fix testutil
2021-04-09 10:42:42 -07:00
Akihiro Suda b77f42c611
testutil: fix specifying shim binary
The `plugins.linux.shim` section in the `config.toml` in the previous code
is meaningless for runtime v2.

For runtime v2, we need to just override `$PATH` to ensure the shim
binary path.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-04-09 15:39:51 +09:00
Alex Couture-Beil ca151bceaf Move git protocol detection into seperate util
- the git protocol detection is required by buildx, and should reside in
a seperate exported gitutil package.

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2021-03-31 12:42:57 -07:00
Aaron Lehmann d3b96f4e31 Add retry on image push 5xx errors
Some registries can be flaky and return intermittent 5xx errors. This
change allows those errors to be retried, similarly to network-level
errors.

Note that this needs the upstream containerd fix
https://github.com/containerd/containerd/pull/5276 to work reliably.

This was tested with a registry that was modified to return 504 on every
other manifest PUT. Without the change, exports to the registry fail
every other attempt.  With the change and the related containerd change,
exports to the registry always succeed.

Signed-off-by: Aaron Lehmann <alehmann@netflix.com>
2021-03-26 18:13:45 -07:00
Akihiro Suda 2219e6bf42
Merge pull request #2036 from earthly/vlad/retry
Retry on temporary network failures
2021-03-24 12:52:29 +09:00
Vlad A. Ionescu ab76674b24 Retry on temporary network failures.
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
2021-03-23 17:28:04 -07:00
Akihiro Suda 8effd45b99
Merge pull request #2031 from tonistiigi/caps-contains
caps: add contains method
2021-03-22 15:36:34 +09:00
Tonis Tiigi 1d982af3b4 caps: add contains method
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-03-21 22:53:27 -07:00
Akihiro Suda 4eca10a46c
Merge pull request #2020 from tonistiigi/push-tags
push: avoid overwriting tags on push
2021-03-16 10:47:52 +09:00
Sebastiaan van Stijn 1b4affddcd
security/entitlements.WithInsecureSpec() remove redundant loop
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-14 13:09:09 +01:00
Tonis Tiigi 1d7526b1bb push: avoid overwriting tags on push
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-03-12 13:45:01 -08:00
Akihiro Suda 13ea18ad08
vendor containerd (requred for rootless overlayfs on kernel 5.11)
Required for rootless overlayfs on kernel 5.11
https://github.com/containerd/containerd/pull/5076

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-10 13:51:27 +09:00
Tonis Tiigi 49c4ab46ad Revert "resolver: fix tcp connections limit"
This reverts commit 58dc579d57.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-20 12:15:25 -08:00
Tonis Tiigi 58dc579d57 resolver: fix tcp connections limit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-02-18 23:04:37 -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
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
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
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
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
Tibor Vass 07029de618
Merge pull request #1879 from tonistiigi/foreign-mediatype
handle foreign mediatypes on push
2020-12-11 11:48:55 -08:00
Tonis Tiigi e56e7ba46b flightcontrol: fix possible invalid cancellation
There was a race with context getting cancelled and new request
arriving that could resulted new request to receive cancelled result
as well. This happened because lock was held when getting the Done()
channel but it could have been already released by the time returned
channel was closed.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-11 00:57:12 -08:00
Tibor Vass fbf8ed15a8 sshutil: allow uppercase usernames (thinking of you thaJeztah)
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-12-11 05:19:39 +00:00
Alex Couture-Beil 201482bba9 Allow for usersnames with hyphens or underscores
- usernames could have - or _
- expand testing cases

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-12-10 17:10:38 -08:00
Alex Couture-Beil 3fa063dcf3 move ssh regexp test to common location
- include testing
- improve hostname checking

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-12-10 17:10:38 -08:00
Tonis Tiigi aabdec1778 handle foreign mediatypes on push
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-12-05 23:16:44 -08:00
Alex Couture-Beil 88580ad989 Fix sshkeyscan to work with ipv6
- make use of standard net.SplitHostPort and net.JoinHostPort functions

Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-11-18 09:19:49 -08:00
Alex Couture-Beil ccac4d664e fix assumption that ssh port must be 2 digits
Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-11-16 17:02:40 -08:00
Alex Couture-Beil 3c73a22430 Add default ssh mount and keyscans when missing
Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
2020-11-16 13:23:37 -08:00
Tonis Tiigi cf8babde54 progress: refactor logger handler to better reuse
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-11-15 13:33:58 -08:00
Tonis Tiigi aa29e77294 fix import cycle in integration test pulls
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-11-11 21:21:08 -08:00
Tonis Tiigi ffe71a1ea9 add retry handlers to push/pull
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-11-11 20:39:01 -08:00
Akihiro Suda 4011b6ef1c
Merge pull request #1754 from tonistiigi/log-clipping
progress: add log limits and clipping
2020-11-06 13:53:38 +09:00
Tonis Tiigi 378fce2290 logs: show log limit in the clipping message
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-11-05 10:47:25 -08:00
Tõnis Tiigi e48da241dc
Merge pull request #1761 from tonistiigi/session-remote
add session injection to remote ref loading
2020-11-03 08:33:28 -08:00
Tonis Tiigi e3b05289d8 add session injection to remote loading
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-11-02 22:20:44 -08:00
Tõnis Tiigi 35f41e9db4
Merge pull request #1775 from earthly/vlad/cni-bug
Fix race in CNI namespaces
2020-11-02 17:48:09 -08:00
Vlad A. Ionescu 03987d2a75 Rename nativeID to nsPath. Simplify.
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
2020-11-02 11:39:17 -08:00
Vlad A. Ionescu 39fd96d2dd Fix race in CNI namespaces.
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
2020-11-02 11:23:28 -08:00
Sebastiaan van Stijn fbe1346912
replace github.com/docker/docker/pkg/locker with moby/locker v1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 09:25:05 +01:00
Tonis Tiigi 6a3d6e983b source: fix puller error caching on cancellation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-27 13:21:49 -07:00
Tonis Tiigi 38ec47c981 progress: add log limits and clipping
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-26 14:51:47 -07:00
Tonis Tiigi ecf070a027 exec: use platform specific default path
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-23 15:30:23 -07:00
Akihiro Suda a340d4171d
Merge pull request #1730 from tonistiigi/gcr-400
exporter: avoid descriptor annotations on docker manifests
2020-10-20 13:49:19 +09:00
Tonis Tiigi c7f5979dd4 exporter: avoid descriptor annotations on docker manifests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-19 12:54:47 -07:00
Tonis Tiigi ca46949277 stack: remove helper functions from error stack traces
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-18 23:36:38 -07:00
Kees Cook fd11490560 Update binfmt_misc tests to have non-executable stack
Fix: #1737

On Linux v5.6+ docker start-up would trigger the exec-stack warning:

process 'docker/tmp/qemu-check490284163/check' started with executable stack

Mark all the binfmt_mist tests as having a non-executable stack, and
regenerate the *_binary.go files.

Additionally fix trailing whitespace and add missing end-of-file newlines.

Signed-off-by: Kees Cook <keescook@chromium.org>
2020-10-17 22:53:27 -07:00