1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

39132 commits

Author SHA1 Message Date
Tibor Vass
b0df70dc37
Merge pull request from thaJeztah/bump_containerd_binary_1.4.2
update containerd binary to v1.4.2
2020-11-30 11:03:36 -08:00
Akihiro Suda
b9a3a51ac5
Merge pull request from elboulangero/fix-permissions-oci-fixtures
Fix permissions oci fixtures
2020-11-29 01:09:53 +09:00
Arnaud Rebillout
f9b2989e97 Fix permissions on oci fixtures files
These two json files were executable, they are now 0644.

Signed-off-by: Arnaud Rebillout <elboulangero@gmail.com>
2020-11-27 10:29:47 +07:00
Sebastiaan van Stijn
703951197c
update containerd binary to v1.4.2
NOTE: the Dockerfile currently uses a single version of Golang for all
      stages. This means that currently, all binaries are built with Go
      1.13.x, including the containerd binary; upstream containerd switched
      to use Go 1.15.

full diff: https://github.com/containerd/containerd/compare/v1.4.1...v1.4.2

Release notes:

Welcome to the v1.4.2 release of containerd!
------------------------------------------------------

The second patch release for containerd 1.4 includes multiple minor fixes
and updates.

Notable Updates

- Fix bug limiting the number of layers by default 
- Fix selinux shared memory issue by relabeling /dev/shm 
- Fix unknown state preventing removal of containers 
- Fix nil pointer error when restoring checkpoint 
- Improve image pull performance when using HTTP 1.1 
- Update default seccomp profile for pidfd 
- Update Go to 1.15

Windows

- Fix integer overflow on Windows 
- Fix lcow snapshotter to read trailing tar data 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-26 14:46:45 +01:00
Sebastiaan van Stijn
e1bba7456d
Merge pull request from tiborvass/fix-ipvalidation-portmapper
vendor libnetwork to fix mix up between IPv4 and IPv6
2020-11-25 14:47:54 +01:00
Brian Goff
35390305e8
Merge pull request from kplachkov/feature/fix_client_error_handling
Fix error handling
2020-11-24 15:33:02 -08:00
Tibor Vass
22e31dbd9a vendor libnetwork to fix mix up between IPv4 and IPv6
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-24 23:22:31 +00:00
Sebastiaan van Stijn
e1b15e1e5b
Merge pull request from sparrc/delete-task-timeout
handleContainerExit: timeout on containerd DeleteTask
2020-11-24 14:24:21 +01:00
Kostadin Plachkov
aeddf93de0 Implement Unwrap to errors
Signed-off-by: Kostadin Plachkov <k.n.plachkov@gmail.com>
2020-11-21 16:36:35 +01:00
Sebastiaan van Stijn
6c0a036dce
Merge pull request from thaJeztah/bump_term
vendor: github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556
2020-11-19 07:51:25 +01:00
Sebastiaan van Stijn
c7f0b509cf
vendor: github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556
full diff: 7f0af18e79...bea5bbe245

- Fix windows integer overflow on GOOS=windows, GOARCH=arm
- go.mod: github.com/creack/pty v1.1.11
  - v1.1.11: Add arm support for OpenBSD
  - v1.1.10: Fix CTTY to work with go1.15
- CI: fix Go version matrix, and drop go 1.12, add go 1.15
- CI: remove "sudo" to fix incorrect Go versions (incorrect PATH, GOROOT)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-19 00:29:13 +01:00
Sebastiaan van Stijn
74455dcbb1
Merge pull request from ameyag/bmp-libnetwork-nil-deference
vendor: docker/libnetwork 6b51d028f4bbb9a4cc8d3eaba13baa9f848af546
2020-11-18 15:24:37 +01:00
Ameya Gawde
2630994b35
Bump libnetwork
Signed-off-by: Ameya Gawde <agawde@mirantis.com>
2020-11-17 16:03:27 -08:00
Tibor Vass
131bf7e685
Merge pull request from thaJeztah/go_winio
vendor: github.com/Microsoft/go-winio v0.4.15 was tagged
2020-11-17 02:12:11 -08:00
Tibor Vass
12fe77c7ea
Merge pull request from cpuguy83/use_head_for_manifest_by_tag
cache manifests on pull
2020-11-16 21:27:43 -08:00
Tibor Vass
cf0ce96eb1
Merge pull request from tiborvass/bk_vendor
vendor buildkit 6861f17f15364de0fe1fd1e6e8da07598a485123
2020-11-16 21:22:12 -08:00
Tibor Vass
dbffbe8f9b builder-next: fix platform-specific behavior
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-17 02:33:01 +00:00
Sebastiaan van Stijn
be67385209
Merge pull request from cuonglm/master
pkg/devicemapper: fix invalid usage of reflect.SliceHeader
2020-11-16 23:05:50 +01:00
Sebastiaan van Stijn
f4214ec847
vendor: github.com/Microsoft/go-winio v0.4.15 was tagged
Same commit as we were already vendoring, so only updating the
comment.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-16 14:15:24 +01:00
Cam
05c20a6e1c
handleContainerExit: put a timeout on containerd DeleteTask
Also move c.Lock() below containerd delete task, as it doesn't seem that
there is any necessity to hold the container lock while containerd is
killing the task.

This fixes a potential edge-case where containerd delete task hangs, and
thereafter all operations on the container would hang forever, as this
function is holding onto the container lock.

Signed-off-by: Cam <gh@sparr.email>
2020-11-14 15:23:29 -08:00
Tibor Vass
beff0a5f2c integration-cli: remove TestBuildContChar
This old test is failing after an edge-case change in dockerfile
parsing considered a bugfix: https://github.com/moby/buildkit/pull/1559

Instead of fixing the test, I suggest removing it as there are already
tests for it in BuildKit.

Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
39f9c1b5d1 builder-next: fix --cache-from panic
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
8f464ae2ab builder-next: refactor to use flighcontrol and remove resolveOnce
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
1b1eb094cc builder-next: simple refactor
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
3756668adb builder-next: Refactor using buildkit's resolver pool
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Tibor Vass
de56a90929 vendor buildkit 6861f17f15364de0fe1fd1e6e8da07598a485123
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-11-14 03:57:36 +00:00
Justin Cormack
b6bfff2a62
Merge pull request from mikroskeem/41664-pidfd-syscalls-support
seccomp: add pidfd syscalls
2020-11-13 10:58:59 +00:00
Tibor Vass
4217958ca6
Merge pull request from thaJeztah/bump_pty
vendor: github.com/creack/pty v1.1.11 (includes fixes for go 1.15)
2020-11-12 21:55:26 -08:00
Brian Goff
13b09180b5
Merge pull request from thaJeztah/remove_e2e_stage
Jenkinsfile: remove e2e image stage
2020-11-12 11:20:18 -08:00
Mark Vainomaa
f7bcb02f67
seccomp: Add pidfd_getfd syscall
Signed-off-by: Mark Vainomaa <mikroskeem@mikroskeem.eu>
2020-11-12 15:31:07 +02:00
Mark Vainomaa
5e3ffe6464
seccomp: Add pidfd_open and pidfd_send_signal
Signed-off-by: Mark Vainomaa <mikroskeem@mikroskeem.eu>
2020-11-11 15:20:34 +02:00
Sebastiaan van Stijn
af34b94a78
Merge pull request from thaJeztah/system_fix_darwin
pkg/system: fix compile on darwin (macOS)
2020-11-10 22:19:21 +01:00
Tibor Vass
228d800f5c
Merge pull request from thaJeztah/replace_deprecated_mount
testutil: remove remaining use of deprecated pkg/mount
2020-11-10 12:41:03 -08:00
Sebastiaan van Stijn
2b41e84719
pkg/system: fix compile on darwin (macOS)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 20:49:09 +01:00
Sebastiaan van Stijn
b4b902b88f
Jenkinsfile: remove e2e image stage
The image that's built is not pushed anywhere, and is just
building the same as the main image already builds, so didn't
add value.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 18:42:13 +01:00
Sebastiaan van Stijn
6d243cdf27
testutil: remove remaining use of deprecated pkg/mount
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 14:46:59 +01:00
Sebastiaan van Stijn
0e8023ddea
Merge pull request from TBBle/37352-fix-Windows-CI-pipeline
Reinstate Windows CI Pipeline usefulness
2020-11-10 02:52:54 +01:00
Brian Goff
470ae8422f
Merge pull request from thaJeztah/cgroupv2_detection
use containerd/cgroups to detect cgroups v2
2020-11-09 10:03:30 -08:00
Brian Goff
e11cabe558
Merge pull request from thaJeztah/bump_cobra
vendor: github.com/spf13/cobra v1.1.1
2020-11-09 09:37:31 -08:00
Akihiro Suda
985592f6b7
Merge pull request from kaydxh/master
[DEL] remove useless assert
2020-11-10 02:08:29 +09:00
kaydxh
43d61d2bcf [DEL] remove useless assert
Signed-off-by: xiaohua ding <xiao_hua_ding@sina.cn>
2020-11-09 23:38:45 +08:00
Sebastiaan van Stijn
6458f750e1
use containerd/cgroups to detect cgroups v2
libcontainer does not guarantee a stable API, and is not intended
for external consumers.

this patch replaces some uses of libcontainer/cgroups with
containerd/cgroups.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-09 15:00:32 +01:00
Paul "TBBle" Hampson
7ba05f2b2b Rewrite VolumesMountedAsShared/Slave as Integration tests
This moves the two tests from integration-CLI to integration.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-11-08 23:15:15 +11:00
Paul "TBBle" Hampson
7bb729e928 Break out non-Windows sys/mount usage into helper
Rather than bifurcate the test completely, this lets us keep the test
intact with a small function wrapper to allow the compiler to build the
code that'll never be called on Windows, on Windows.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-11-08 23:15:15 +11:00
Paul "TBBle" Hampson
3e3f3d7168 Move tests using sys/mount to not build on Windows
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-11-08 23:15:15 +11:00
Paul "TBBle" Hampson
a158b53d86 Separate non-Windows mount code from common code
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-11-08 23:15:15 +11:00
Paul "TBBle" Hampson
080d9df63e Don't clear the exit code from the Finally block
It turns out that the Finally block does not see the exit code from the
`exit` call that triggered it, but from an earlier state. And it seems
that actions take in the Finally block other than `exit` will not affect
the $LastErrorCode set by the `exit` that triggered the Finally block.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-11-08 23:15:15 +11:00
Akihiro Suda
c7109494fe
Merge pull request from thaJeztah/unify_consts
opts: unify host-options, and use consts
2020-11-08 19:31:07 +09:00
Brian Goff
b5ea9abf25
Merge pull request from thaJeztah/fix_stream_detection
builder: fix detection of experimental --stream option (deprecated)
2020-11-06 14:13:25 -08:00
Sebastiaan van Stijn
4ee8688c4a
Merge pull request from tianon/containerd-namespace-flags
Unhide containerd-namespace flags
2020-11-06 22:12:30 +01:00