Commit graph

43284 commits

Author SHA1 Message Date
Sebastiaan van Stijn
875969251b
vendor: golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
full diff: 63515b42dc...69cdffdb93

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-19 09:53:57 +01:00
Sebastiaan van Stijn
4fafb27799
Merge pull request #43017 from akerouanton/fix-42468
Fix flaky TestPortMappingV6Config
2021-11-19 09:20:14 +01:00
Tianon Gravi
7ae9ca749b
Merge pull request #43032 from thaJeztah/windows_containerd_1.5.8
Dockerfile.windows: update containerd binary to v1.5.8
2021-11-18 16:55:01 -08:00
Sebastiaan van Stijn
c0f93c746e
Merge pull request #43029 from thaJeztah/remove_v1_push_tests
integration-cli: remove manifest v2 schema 1 push tests
2021-11-18 21:52:21 +01:00
Sebastiaan van Stijn
c3537ec24c
Dockerfile.windows: update containerd binary to v1.5.8
This was accidentally forgotten in aef782f348

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-18 21:48:30 +01:00
Brian Goff
78fd4d3f2f
Merge pull request #42993 from thaJeztah/bump_hcsshim
vendor: github.com/Microsoft/hcsshim v0.8.22
2021-11-18 11:31:25 -08:00
Sebastiaan van Stijn
238180d292
integration-cli: remove manifest v2 schema 1 push tests
Pushing manifest v2, schema 1 images has been deprecated in commit
6302dbbf46 (docker 20.10). It's still used in
some tests to provision a legacy registry to test _pulling_ legacy images
(which is still "supported"), but we should no longer have to validate pushing
for other scenarios.

This patch removes the schema 1 push tests, and inlines the code that was
extracted in non-exported functions (for them to be shared between schema 2 and
schema 1 tests).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-18 12:26:13 +01:00
Sebastiaan van Stijn
a17f288e65
Merge pull request #43026 from thaJeztah/update_image_spec
vendor: github.com/opencontainers/image-spec v1.0.2
2021-11-18 01:09:55 +01:00
Sebastiaan van Stijn
cef0a7c14e
vendor: github.com/opencontainers/image-spec v1.0.2
- Bring mediaType out of reserved status
- specs-go: adding mediaType to the index and manifest structures

full diff: https://github.com/opencontainers/image-spec/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-18 00:00:05 +01:00
Sebastiaan van Stijn
40e6c2ad34
Merge pull request #43025 from thaJeztah/containerd_1.5.8
Update containerd binary and vendor to v1.5.8
2021-11-17 23:50:13 +01:00
Sebastiaan van Stijn
458b4aae19
vendor: github.com/containerd/containerd v1.5.8
contains a mitigation for CVE-2021-41190 as well as several fixes and updates.

full diff: https://github.com/containerd/containerd/compare/v1.5.7...v1.5.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-17 21:40:04 +01:00
Sebastiaan van Stijn
aef782f348
update containerd binary to v1.5.8
The eighth patch release for containerd 1.5 contains a mitigation for CVE-2021-41190
as well as several fixes and updates.

Notable Updates

* Handle ambiguous OCI manifest parsing
* Filter selinux xattr for image volumes in CRI plugin
* Use DeactiveLayer to unlock layers that cannot be renamed in Windows snapshotter
* Fix pull failure on unexpected EOF
* Close task IO before waiting on delete
* Log a warning for ignored invalid image labels rather than erroring
* Update pull to handle of non-https urls in descriptors

See the changelog for complete list of changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-17 21:25:05 +01:00
Brian Goff
c09dcfc693
Merge pull request #43021 from thaJeztah/bump_selinux
vendor: github.com/opencontainers/selinux v1.9.1
2021-11-16 10:50:45 -08:00
Sebastiaan van Stijn
615ff22437
vendor: github.com/opencontainers/selinux v1.9.1
full diff: https://github.com/opencontainers/selinux/compare/v1.8.2...v1.9.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-16 10:33:00 +01:00
Albin Kerouanton
c721bad8cc
Fix flaky TestPortMappingV6Config
Since moby/libnetwork#2635 has been merged, allocatePortsInternal()
checks if IPv6 is enabled by calling IsV6Listenable(). This function
calls `net.Listen("tcp6", "[::1]:0")` and returns false when
net.Listen() fails.

TestPortMappingV6Config() starts by setting up a new net ns to run into
it. The loopback interface is not bring up in this net ns, thus
net.Listen() fails and IsV6Listenable() returns false. This change takes
care of bringing loopback iface up right after moving to the new net ns.

This test has been reported has flaky on s390x in #42468. For some
reason, this test seems to be consistently green on the CI (on amd64
arch) and when running `hack/test/unit` locally. However it consistently
fails when running `TESTFLAGS='-shuffle on' hack/test/unit` locally.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
2021-11-16 09:37:34 +01:00
Sebastiaan van Stijn
e9ab1d4256
Merge pull request #42996 from robert-shade/rshade/fix-windows-reserved-names
Fix windows rxReservedNames
2021-11-16 09:35:57 +01:00
Akihiro Suda
40ccedd61b
Merge pull request #42785 from sanchayanghosh/42753-fix-host.internal
Fixed docker.internal.gateway not displaying properly on live restore
2021-11-16 13:26:20 +09:00
Tianon Gravi
58e68789bf
Merge pull request #42999 from tonicbupt/error-details
log error message when receiving an unexpected type error
2021-11-15 12:05:17 -08:00
Sebastiaan van Stijn
df7bba7dbc
Merge pull request #42992 from thaJeztah/bump_mergo_v0.3.12
vendor: github.com/imdario/mergo v0.3.12
2021-11-11 17:59:17 +01:00
Akihiro Suda
d116e12c6d
Merge pull request #42726 from thaJeztah/daemon_simplify_nwconfig
daemon: simplify networking config
2021-11-12 01:19:07 +09:00
Sebastiaan van Stijn
99cb9adcab
Merge pull request #43010 from thaJeztah/jenkinsfile_check_config
Jenkinsfile: update check-config script to latest version
2021-11-11 09:01:22 +01:00
Brian Goff
402d106142
Merge pull request #43009 from thaJeztah/skip_TestBuildWCOWSandboxSize
testing: skip TestBuildWCOWSandboxSize for now
2021-11-10 11:59:09 -08:00
Brian Goff
9850b6938e
Merge pull request #42995 from thaJeztah/fix_TestBuildUserNamespaceValidateCapabilitiesAreV2
TestBuildUserNamespaceValidateCapabilitiesAreV2: cleanup daemon storage
2021-11-10 11:58:12 -08:00
Sebastiaan van Stijn
080529dfea
Jenkinsfile: update check-config script to latest version
Diff:

    git diff 2b0755b936416834e14208c6c37b36977e67ea35...33a3680e08d1007e72c3b3f1454f823d8e9948ee -- contrib/check-config.sh

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-10 17:11:48 +01:00
Sebastiaan van Stijn
2a6a4587fa
testing: skip TestBuildWCOWSandboxSize for now
This test is failing frequently once nodes have less disk space
available. Skipping the test for now, but we can continue looking
for a good solution.

Tracked through https://github.com/moby/moby/issues/42743

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-10 15:38:22 +01:00
Sebastiaan van Stijn
eea2758761
TestBuildUserNamespaceValidateCapabilitiesAreV2: cleanup daemon storage
This should help with Jenkins failing to clean up the Workspace:

- make sure "cleanup" is also called in the defer for all daemons. keeping
  the daemon's storage around prevented Jenkins from cleaning up.
- close client connections and some readers (just to be sure)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-10 12:25:16 +01:00
Sebastiaan van Stijn
1a15a1a061
testutil: daemon.Cleanup(): cleanup more directories
The storage-driver directory caused Jenkins cleanup to fail. While at it, also
removing other directories that we do not include in the "bundles" that are
stored as Jenkins artifacts.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-10 12:09:58 +01:00
tonic
24aaa7f8c9 log error message when receiving an unexpected type error
Signed-off-by: tonic <tonicbupt@gmail.com>
2021-11-09 17:53:08 +08:00
Akihiro Suda
33a3680e08
Merge pull request #42738 from thaJeztah/client_networkinspect_test
client: use subtests for TestNetworkInspect
2021-11-09 18:37:44 +09:00
Sebastiaan van Stijn
d9e3d383f5
Merge pull request #42990 from thaJeztah/bump_go_1.17.3
Update Go to 1.17.3
2021-11-09 10:35:43 +01:00
Tianon Gravi
65cc84abc5
Merge pull request #42152 from AkihiroSuda/fix-rootless-info-42151
info: unset cgroup-related fields when CgroupDriver == none
2021-11-08 14:45:11 -08:00
Tianon Gravi
2d93da12af
Merge pull request #43002 from AkihiroSuda/rootlesskit-0.14.6
bump up rootlesskit from v0.14.4 to v0.14.6
2021-11-08 11:38:06 -08:00
Robert Shade
502b35c8f6 Fix windows rxReservedNames
This regex is currently matching volumes that include a
reserved word (ex. test-aux-volume)

Signed-off-by: Robert Shade <robert.shade@gmail.com>
2021-11-08 13:14:11 -05:00
Sebastiaan van Stijn
9370ea2624
Merge pull request #42994 from thaJeztah/bump_containerd
vendor: github.com/containerd/containerd v1.5.7
2021-11-08 10:29:14 +01:00
Akihiro Suda
61b43b1eb8
bump up rootlesskit from v0.14.4 to v0.14.6
Minor fixes and refactoring.
https://github.com/rootless-containers/rootlesskit/compare/v0.14.4...v0.14.6

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-11-08 16:10:56 +09:00
Sebastiaan van Stijn
582ef29426
vendor: github.com/containerd/containerd v1.5.7
full diff: https://github.com/containerd/containerd/compoare/v1.5.5...v1.5.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 15:16:56 +01:00
Sebastiaan van Stijn
c97d09b1e1
vendor: github.com/Microsoft/hcsshim v0.8.22
No significant changes for our vendored code, but reverts back containerd minimal
dependency to v1.4.9.

full diff: https://github.com/Microsoft/hcsshim/compare/v0.8.20...v0.8.22

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 14:55:40 +01:00
Sebastiaan van Stijn
5f79e03624
vendor: github.com/imdario/mergo v0.3.12
full diff: https://github.com/imdario/mergo/compoare/v0.3.8...v0.3.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 14:43:24 +01:00
Sebastiaan van Stijn
ce668d6c1e
Update Go to 1.17.3
go1.17.3 (released 2021-11-04) includes security fixes to the archive/zip and
debug/macho packages, as well as bug fixes to the compiler, linker, runtime, the
go command, the misc/wasm directory, and to the net/http and syscall packages.
See the Go 1.17.3 milestone on our issue tracker for details.

From the announcement e-mail:

[security] Go 1.17.3 and Go 1.16.10 are released

We have just released Go versions 1.17.3 and 1.16.10, minor point releases.
These minor releases include two security fixes following the security policy:

- archive/zip: don't panic on (*Reader).Open
  Reader.Open (the API implementing io/fs.FS introduced in Go 1.16) can be made
  to panic by an attacker providing either a crafted ZIP archive containing
  completely invalid names or an empty filename argument.
  Thank you to Colin Arnott, SiteHost and Noah Santschi-Cooney, Sourcegraph Code
  Intelligence Team for reporting this issue. This is CVE-2021-41772 and Go issue
  golang.org/issue/48085.
- debug/macho: invalid dynamic symbol table command can cause panic
  Malformed binaries parsed using Open or OpenFat can cause a panic when calling
  ImportedSymbols, due to an out-of-bounds slice operation.
  Thanks to Burak Çarıkçı - Yunus Yıldırım (CT-Zer0 Crypttech) for reporting this
  issue. This is CVE-2021-41771 and Go issue golang.org/issue/48990.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 10:55:40 +01:00
Sebastiaan van Stijn
c09789c114
Merge pull request #42984 from al-cheb/al-cheb/create-panic-log-without-readonly
[Windows] cmd/dockerd: create panic.log file without readonly flag
2021-11-03 08:55:56 +01:00
Aleksandr Chebotov
b865204042 cmd/dockerd: create panic.log file without readonly flag
Signed-off-by: Aleksandr Chebotov <v-aleche@microsoft.com>
2021-11-02 18:41:08 +03:00
Sebastiaan van Stijn
229bc1ee8b
Merge pull request #42965 from thaJeztah/do_not_retry
distribution: do not retry unsupported layer media types
2021-10-28 21:18:23 +02:00
Sebastiaan van Stijn
89a3c427aa
Merge pull request #42961 from milas/fix-path-match-escape
pkg/fileutils: escape additional regex meta characters
2021-10-28 20:25:21 +02:00
Sebastiaan van Stijn
b64b9811c3
Merge pull request #42835 from thaJeztah/proxy_daemon_config_carry2
Add http(s) proxy properties to daemon configuration (carry 42647)
2021-10-28 20:14:54 +02:00
Akihiro Suda
02016803f0
Merge pull request #42725 from thaJeztah/runconfig_simplify
runconfig: decodeContainerConfig() return early if there's no HostConfig
2021-10-27 20:15:14 +09:00
sanchayanghosh
894230b82d
Fixed docker.internal.gateway not displaying properly on live restore
Also includes review suggestions in daemon.initNetworkController():

- update godoc for setHostGatewayIP()
- change setHostGatewayIP() to get config, instead of daemon
- remove redundant nil check for controller

Signed-off-by: sanchayanghosh <sanchayanghosh@outlook.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-27 12:44:56 +02:00
Sebastiaan van Stijn
e7583ab859
testutil/daemon: ReadLogFile() trigger os.Sync() before reading
Make sure it's written to disk before we try reading the logs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-27 12:39:06 +02:00
Sebastiaan van Stijn
040b1d5eeb
integration/daemon: use "windows" to skip tests
For consistency, and to allow easier grepping for all tests
that we skip on windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-27 12:39:04 +02:00
Sebastiaan van Stijn
76016b846d
daemon: make sure proxy settings are sanitized when printing
The daemon can print the proxy configuration as part of error-messages,
and when reloading the daemon configuration (SIGHUP). Make sure that
the configuration is sanitized before printing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-27 12:39:02 +02:00
Sebastiaan van Stijn
bad4b30e65
integration: skip TestDaemonProxy on rootless CI
The proxy configuration works, but looks like we're unable to connect to the
test proxy server as part of our test;

    level=debug msg="Trying to pull example.org:5000/some/image from https://example.org:5000 v2"
    level=warning msg="Error getting v2 registry: Get \"https://example.org:5000/v2/\": proxyconnect tcp: dial tcp 127.0.0.1:45999: connect: connection refused"
    level=info msg="Attempting next endpoint for pull after error: Get \"https://example.org:5000/v2/\": proxyconnect tcp: dial tcp 127.0.0.1:45999: connect: connection refused"
    level=error msg="Handler for POST /v1.42/images/create returned error: Get \"https://example.org:5000/v2/\": proxyconnect tcp: dial tcp 127.0.0.1:45999: connect: connection refused"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-27 12:39:00 +02:00