Sebastiaan van Stijn
5176095455
Merge pull request #42674 from thaJeztah/bump_gotestsum
...
Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0
2021-09-02 23:24:14 +02:00
Sebastiaan van Stijn
772e25fa9f
Merge pull request #42769 from thaJeztah/swagger_event_type
...
swagger: assorted fixes and updates
2021-09-02 23:23:49 +02:00
Sebastiaan van Stijn
1b8db06785
Dockerfile: update gotestsum to v1.7.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:23:26 +02:00
Sebastiaan van Stijn
14ff070469
Dockerfile: use "go install" to install utilities
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:23:24 +02:00
Sebastiaan van Stijn
a7a7c732c0
Dockerfile: use version for some utilities instead of commit-sha
...
The golangci-lint, gotestsum, shfmt, and vndr utilities should generally
be ok to be pinned by version instead of a specific sha. Also rename
the corresponding env-vars / build-args accordingly:
- GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION
- GOTESTSUM_COMMIT -> GOTESTSUM_VERSION
- SHFMT_COMMIT -> SHFMT_VERSION
- VNDR_COMMIT -> VNDR_VERSION
- CONTAINERD_COMMIT -> CONTAINERD_VERSION
- RUNC_COMMIT -> RUNC_VERSION
- ROOTLESS_COMMIT -> ROOTLESS_VERSION
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:23:20 +02:00
Sebastiaan van Stijn
3cec4b8cd4
Dockerfile: remove GOPROXY override (was for go < 1.14)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:22:30 +02:00
Sebastiaan van Stijn
3c7c18a499
remove deprecated "nokmem" build-tag for runc
...
This build-tag was removed in 52390d6804
,
which is part of runc v1.0.0-rc94 and up, so no longer relevant.
the kmem options are now always disabled in runc.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:22:24 +02:00
Sebastiaan van Stijn
1de1d26eda
api/swagger: move DistributionInspect to definitions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:13:22 +02:00
Sebastiaan van Stijn
9c0ca67e95
api/swagger: rename PluginPrivilegeItem to PluginPrivilege
...
To match the name in Go
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:06:47 +02:00
Sebastiaan van Stijn
a207eea6a4
api/swagger: fix up event-types and move to definitions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-02 21:06:44 +02:00
Sebastiaan van Stijn
8fa6126f75
Merge pull request #42543 from rainrambler/patch-1
...
use defer to unlock mutex
2021-09-01 13:26:30 +02:00
Brian Goff
94e00d09da
Merge pull request #42797 from thaJeztah/go116_compat
...
pkg/plugins: fix compatibility with go1.16
2021-08-31 08:19:59 -07:00
Sebastiaan van Stijn
303ea8e820
pkg/plugins: fix compatibility with go1.16
...
commit c55a4ac779
changed the ioutil utilities
to use the new os variants, per recommendation from the go 1.16 release notes:
https://golang.org/doc/go1.16#ioutil
> we encourage new code to use the new definitions in the io and os packages.
> Here is a list of the new locations of the names exported by io/ioutil:
However, the devil is in the detail, and io.ReadDir() is not a direct
replacement for ioutil.ReadDir();
> ReadDir => os.ReadDir (note: returns a slice of os.DirEntry rather than a slice of fs.FileInfo)
go1.16 added a io.FileInfoToDirEntry() utility to concert a DirEntry to
a FileInfo, but it's not available in go1.16
This patch copies the FileInfoToDirEntry code, and uses it for go1.16.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-31 15:42:54 +02:00
Sebastiaan van Stijn
8684f482e4
Merge pull request #42782 from dkkb/McGrady/code_improvement
...
Remove platform argument from Puller interface.
2021-08-30 13:19:08 +02:00
Akihiro Suda
fecf45b09a
Merge pull request #42796 from thaJeztah/containerd_seccomp_check
...
pkg/sysinfo: use containerd/pkg/seccomp.IsEnabled()
2021-08-29 03:05:59 +09:00
Sebastiaan van Stijn
abd7966165
Merge pull request #42794 from thaJeztah/remove_libnetwork_api
...
libnetwork: remove API, as it's no longer used
2021-08-28 04:41:21 +02:00
Sebastiaan van Stijn
7bdf98276c
Merge pull request #42787 from thaJeztah/libnetwork_fix_lint
...
libnetwork: fix some linting issues
2021-08-28 01:18:13 +02:00
Sebastiaan van Stijn
175dc09491
Merge pull request #42795 from thaJeztah/libnetwork_cleanup
...
libnetwork/types: remove unused functions
2021-08-27 19:43:34 +02:00
Akihiro Suda
0cd1bd42b4
Merge pull request #42770 from thaJeztah/eventtype_enums
...
api/types/events: add "Type" type for event-type enum
2021-08-28 00:23:56 +09:00
Akihiro Suda
9e7bbdb9ba
Merge pull request #40084 from thaJeztah/hostconfig_const_cleanup
...
api/types: hostconfig: add some constants/enums and minor code cleanup
2021-08-28 00:21:31 +09:00
Sebastiaan van Stijn
c23eae3114
libnetwork/ipamapi: godoc fixes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 16:52:46 +02:00
Sebastiaan van Stijn
92ea7df3d1
libnetwork: fix some linting issues
...
- fix incorrectly formatted GoDoc and comments
- rename a variable that collided with the `cap` built-in
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 16:52:44 +02:00
Sebastiaan van Stijn
c425188bc0
libnetwork: remove API, as it's no longer used
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 16:50:33 +02:00
Sebastiaan van Stijn
085c6a98d5
Merge pull request #42792 from Juneezee/deprecate-ioutil
...
refactor: move from io/ioutil to io and os package
2021-08-27 16:49:20 +02:00
Sebastiaan van Stijn
ae0795a99c
Merge pull request #42765 from thaJeztah/windows_2022_ltsc
...
Jenkinsfile: windows 2022 LTSC mcr.microsoft.com/windows/servercore:ltsc2022
2021-08-27 15:52:58 +02:00
Sebastiaan van Stijn
c4040417b6
Merge pull request #42791 from AkihiroSuda/cmd-dockerd-rootless-doc
...
cmd/dockerd: add the link of "the documentation"
2021-08-27 15:50:15 +02:00
Sebastiaan van Stijn
accec292c1
pkg/sysinfo: use containerd/pkg/seccomp.IsEnabled()
...
This replaces the local SeccompSupported() utility for the implementation in containerd,
which performs the same check.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 15:21:52 +02:00
rainrambler
7ce810c771
use defer to unlock mutex
...
use defer to unlock mutex (clean up)
Signed-off-by: Anyu Wang <wanganyu@outlook.com>
Signed-off-by: rainrambler <wanganyu@outlook.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 14:39:46 +02:00
Sebastiaan van Stijn
073f8df0fe
libnetwork/types: remove TransportPort.FromString() as it's unused
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 14:16:32 +02:00
Sebastiaan van Stijn
7c0d8fa5da
libnetwork/types: remove PortBinding.FromString() as it's unused
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 14:16:30 +02:00
Sebastiaan van Stijn
513310f776
libnetwork/types: remove GetMinimalIPNet() as it's unused
...
This wass addded in 4e48ff3aab
but never used.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-27 14:16:28 +02:00
Akihiro Suda
1a67e9572e
cmd/dockerd: add the link of "the documentation"
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-08-27 17:14:02 +09:00
Eng Zer Jun
c55a4ac779
refactor: move from io/ioutil to io and os package
...
The io/ioutil package has been deprecated in Go 1.16. This commit
replaces the existing io/ioutil functions with their new definitions in
io and os packages.
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
2021-08-27 14:56:57 +08:00
Da McGrady
6f5beea146
Remove platform argument from Puller interface.
...
The platform argument is unneeded because ImagePullConfig is already in the v2Puller struct.
Signed-off-by: Da McGrady <dabkb@aol.com>
2021-08-27 09:34:10 +08:00
Sebastiaan van Stijn
2b70006e3b
Merge pull request #42777 from thaJeztah/update_go_1.17
...
Update to Go 1.17.0
2021-08-26 21:24:23 +02:00
Sebastiaan van Stijn
2bb21b85c2
Merge pull request #42598 from deepy/linux-routeoverlaps-link-only
...
Only check if route overlaps routes with scope: LINK
2021-08-26 09:58:35 +02:00
Alex Nordlund
ee9e526764
Only check if route overlaps routes with scope: LINK
...
Signed-off-by: Alex Nordlund <alexander.nordlund@nasdaq.com>
2021-08-25 10:58:06 +02:00
Sebastiaan van Stijn
aa606307b7
vendor: update archive/tar to match Go 1.17.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-24 23:33:32 +02:00
Sebastiaan van Stijn
686be57d0a
Update to Go 1.17.0, and gofmt with Go 1.17
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-24 23:33:27 +02:00
Sebastiaan van Stijn
8207c05cfc
Merge pull request #41479 from olljanat/ci-win-containerd-support
...
Windows CI: Add support for testing with containerd
2021-08-24 22:29:14 +02:00
Brian Goff
a44a8e54ce
Merge pull request #42717 from thaJeztah/move_defaults
2021-08-24 09:33:22 -07:00
Sebastiaan van Stijn
768a1de1d0
Merge pull request #42780 from tonistiigi/update-tar-split
...
vendor: update tar-split to v0.11.2
2021-08-24 01:04:39 +02:00
Tonis Tiigi
21faae85ee
vendor: update tar-split to v0.11.2
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-08-23 14:37:53 -07:00
Sebastiaan van Stijn
247f4796d2
api/types/events: add "Type" type for event-type enum
...
Currently just an alias for string, but we can change it to be an
actual type.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 21:14:55 +02:00
Tianon Gravi
2561e33771
Merge pull request #42768 from thaJeztah/libcontainerd_fix_godoc
...
libcontainerd/local: fix GoDoc
2021-08-23 11:51:29 -07:00
Sebastiaan van Stijn
b8b5fd63f1
Merge pull request #42776 from thaJeztah/remove_tini_version_check
...
info: remove "expected" check for tini version
2021-08-23 19:40:09 +02:00
Sebastiaan van Stijn
2740726ce1
Merge pull request #42773 from thaJeztah/simplify_version_compare
...
api/types/versions: simplify compare if versions are equal
2021-08-23 19:37:29 +02:00
Sebastiaan van Stijn
ab1559c97c
Merge pull request #42779 from thaJeztah/fix_hack_vendor
...
hack/vendor.sh: allow go version to be specified with .0
2021-08-23 19:25:34 +02:00
Akihiro Suda
8c8e4e3271
Merge pull request #42778 from thaJeztah/bump_x_sys
...
vendor: golang.org/x/sys 63515b42dcdf9544f4e6a02fd7632793fde2f72d (for Go 1.17)
2021-08-24 01:51:55 +09:00
Tianon Gravi
88bd93fa60
Merge pull request #42694 from thaJeztah/client_remove_CustomHTTPHeaders
...
client: remove deprecated SetCustomHTTPHeaders(), CustomHTTPHeaders()
2021-08-23 09:35:53 -07:00