summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "seccomp: whitelist io-uring related system calls"revert-39415-masterAkihiro Suda2020-07-172-6/+0
* Merge pull request #41016 from kolyshkin/cgroup-initBrian Goff2020-07-168-114/+92
|\
| * Untangle CPU RT controller initKir Kolyshkin2020-06-262-35/+44
| * pkg/sysinfo: rm duplicatesKir Kolyshkin2020-06-267-81/+50
* | Merge pull request #41065 from AkihiroSuda/cgroup2-ciSebastiaan van Stijn2020-07-164-20/+87
|\ \
| * | test-integration: support cgroup2Akihiro Suda2020-06-224-20/+87
* | | Merge pull request #40499 from thaJeztah/docker_py_api_versionTibor Vass2020-07-161-1/+5
|\ \ \
| * | | docker-py: override default API version to run all testsSebastiaan van Stijn2020-02-111-1/+5
* | | | Merge pull request #40807 from wpjunior/plugin-feedbackSebastiaan van Stijn2020-07-162-7/+20
|\ \ \ \
| * | | | Improve error feedback when plugin does not implement desired interfaceWilson Júnior2020-04-212-7/+20
* | | | | Merge pull request #41214 from thaJeztah/remove_unused_v2Akihiro Suda2020-07-162-5/+0
|\ \ \ \ \
| * | | | | Remove unused useShimV2()Sebastiaan van Stijn2020-07-152-5/+0
* | | | | | Merge pull request #41210 from AkihiroSuda/shim2-defaultBrian Goff2020-07-152-10/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | cgroup v1: change the default runtime to io.containerd.runc.v2Akihiro Suda2020-07-152-10/+2
|/ / / / /
* | | | | Merge pull request #41182 from cpuguy83/runtime_configure_shimBrian Goff2020-07-1418-178/+238
|\ \ \ \ \
| * | | | | Configure shims from runtime configBrian Goff2020-07-1317-177/+237
| * | | | | Fix lint error on sprintf call for runtime stringBrian Goff2020-07-091-1/+1
* | | | | | Merge pull request #40994 from gaurav1086/rm_test_fix_goroutine_leakSebastiaan van Stijn2020-07-141-1/+1
|\ \ \ \ \ \
| * | | | | | rm_test: fix goroutine leakGaurav Singh2020-05-181-1/+1
* | | | | | | Merge pull request #40941 from cpuguy83/down_with_the_func_initSebastiaan van Stijn2020-07-141-19/+19
|\ \ \ \ \ \ \
| * | | | | | | Don't use ini() to set unpigz pathBrian Goff2020-05-091-19/+19
* | | | | | | | Merge pull request #41189 from thaJeztah/bump_libnetworkTibor Vass2020-07-139-40/+197
|\ \ \ \ \ \ \ \
| * | | | | | | | vendor: libnetwork 9e99af28df21367340c95a3863e31808d689c92aSebastiaan van Stijn2020-07-089-40/+197
* | | | | | | | | Merge pull request #41083 from thaJeztah/more_warningsBrian Goff2020-07-091-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | info: add warnings about missing blkio cgroup supportSebastiaan van Stijn2020-06-081-0/+19
* | | | | | | | | | Merge pull request #41168 from thaJeztah/raise_minimum_memory_limitBrian Goff2020-07-095-12/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set minimum memory limit to 6M, to account for higher startup memory useSebastiaan van Stijn2020-07-015-12/+10
* | | | | | | | | | | Merge pull request #41174 from thaJeztah/api_v1.40_syncBrian Goff2020-07-092-675/+1859
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | docs: sync API v1.39 swagger formatting with current versionSebastiaan van Stijn2020-07-031-341/+956
| * | | | | | | | | | | docs: sync API v1.40 swagger formatting with current versionSebastiaan van Stijn2020-07-031-334/+903
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #41172 from thaJeztah/cleanup_swaggerSebastiaan van Stijn2020-07-091-10/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | swagger: add DeviceRequests to container create, inspect exampleSebastiaan van Stijn2020-07-031-0/+16
| * | | | | | | | | | | swagger: move NetworkingConfig to definitionsSebastiaan van Stijn2020-07-031-10/+37
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #41144 from kevpar/revendor-hcsshimSebastiaan van Stijn2020-07-084-16/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revendor hcsshim to fix image import bugKevin Parsons2020-07-064-16/+23
* | | | | | | | | | | | Merge pull request #41186 from thaJeztah/clocky_ticky_tickyBrian Goff2020-07-083-20/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | daemon/stats: use const for clockTicksPerSecondSebastiaan van Stijn2020-07-083-20/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #41025 from AkihiroSuda/runc-rc11-preKir Kolyshkin2020-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update runc binary to v1.0.0-rc91Akihiro Suda2020-07-021-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #41157 from AkihiroSuda/improve-info-warnTõnis Tiigi2020-07-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | info: improve "WARNING: Running in rootless-mode without cgroup"Akihiro Suda2020-06-291-2/+2
* | | | | | | | | | | Merge pull request #41029 from thaJeztah/bump_selinuxBrian Goff2020-07-014-30/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | vendor: opencontainers/selinux v1.5.2Sebastiaan van Stijn2020-05-264-30/+32
* | | | | | | | | | | | Merge pull request #41145 from wanghuaiqing2010/masterTianon Gravi2020-07-0116-40/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Upgrading the versions of images in Dockerfile.wanghuaiqing2020-06-3016-40/+40
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #41169 from tao12345666333/update-containerd-v1.3.6Brian Goff2020-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | update containerd to v1.3.6Jintao Zhang2020-07-021-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #41151 from thaJeztah/fix_gotestsum_install_againBrian Goff2020-06-292-12/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | hack/install: build gotestsum without -buildmode=pieSebastiaan van Stijn2020-06-261-1/+1
| * | | | | | | | | | | Dockerfile.windows: fix gotestsum.installer installing wrong versionSebastiaan van Stijn2020-06-261-9/+6