Davanum Srinivas
f328f61b81
Update to selinux 1.5.1
...
Changes are listed here:
https://github.com/opencontainers/selinux/compare/v1.3.3...v1.5.1
Not urgent as such, just keep up with eco-system.
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-04-08 06:29:50 -04:00
Phil Estes
f7c2bf544e
Migrate functions to actions
...
Reduce duplication while we test GH actions
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-04-07 17:32:05 -04:00
Phil Estes
dc29ce296b
Merge pull request #4163 from estesp/longer-integ-timeout
...
Update integration test timeout
2020-04-07 17:27:36 -04:00
Phil Estes
d7c2513ff3
Update integration test timeout
...
Also few changes to names of workflow jobs. Integration tests can get
canceled without full completing at 10 minutes. Make sure we only use
checkout v2 action.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-04-07 16:34:54 -04:00
Maksym Pavlenko
0caa233158
Rework shim logger shutdown process
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-07 12:42:04 -07:00
Akihiro Suda
4660e4dbb6
Merge pull request #4153 from thaJeztah/update_go_events
...
vendor: update go-events to fix alignment for 32bit systems
2020-04-07 10:09:49 +09:00
Derek McGowan
173cbc1ba9
Merge pull request #4155 from fuweid/bugfix-for-default-hostconfig
...
bugfix: add default host config if not set
2020-04-06 16:01:22 -07:00
Derek McGowan
067aba732e
Add test for default setup for host configuration
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-04-06 14:39:49 -07:00
Wei Fu
d9a1c3f9e4
bugfix: add default host config if not set
...
If there is not specific host config, like ctr does, the resolver will
fail to get host path. And this patch is to add default host config if
needs.
And default config host config should have all caps for pull and push.
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-04-06 14:38:52 -07:00
Michael Crosby
23fc8597db
Merge pull request #4157 from mxpv/gh
...
Move builds and integration tests to Github actions
2020-04-06 17:27:42 -04:00
Maksym Pavlenko
6d4429edde
Setup dependencies between jobs
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-06 13:02:07 -07:00
Maksym Pavlenko
fe7bfffbf4
Merge pull request #4151 from thaJeztah/bump_runtime_spec
...
vendor: runtime-spec v1.0.2
2020-04-05 16:37:33 -07:00
Maksym Pavlenko
e598e5e0c6
Add CRI tests
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-05 13:02:10 -07:00
Maksym Pavlenko
4175ebf236
Move integration tests to Github Actions
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-05 12:56:32 -07:00
Maksym Pavlenko
599547d9cb
Make binaries with Github Actions
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-05 12:53:40 -07:00
Wei Fu
ba5a904f54
Merge pull request #4156 from mxpv/bolt-revert
...
Revert "vendor: update go.etcd.io/bbolt v1.3.4"
2020-04-05 22:33:10 +08:00
Maksym Pavlenko
3968fb0a49
Revert "vendor: update go.etcd.io/bbolt v1.3.4"
...
This reverts commit fb9e3d9f21Fixes : #4154
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-04-04 23:19:40 -07:00
Akihiro Suda
a89fe1b5b8
Merge pull request #4152 from thaJeztah/bump_cgroup_deps
...
vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644
2020-04-04 21:57:14 +09:00
Sebastiaan van Stijn
056d602240
vendor: update go-events to fix alignment for 32bit systems
...
- relates to moby/buildkit 1111
- relates to moby/buildkit 1079
- relates to docker/buildx 129
full diff: 9461782956...e31b211e4f
2020-04-04 02:02:17 +02:00
Sebastiaan van Stijn
4fb3410f65
vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644
...
full diff: 60c3aa43f4...4032b1d8aa
2020-04-04 00:31:39 +02:00
Sebastiaan van Stijn
e822296fc4
vendor: runtime-spec v1.0.2
...
full diff: 29686dbc55
2020-04-04 00:21:43 +02:00
Michael Crosby
b0e71d7977
Merge pull request #4146 from kzys/cgroups-upgrade
...
Upgrade containerd/cgroups to b4448137398923af7f4918b8b2ad8249172ca7a6
2020-04-03 15:38:22 -04:00
Michael Crosby
c52691f732
Merge pull request #4145 from thaJeztah/bump_golang_1.13.9
...
Bump Golang 1.13.9
2020-04-03 15:11:41 -04:00
Kazuyoshi Kato
3261fb5c49
vendor: containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
...
full diff: 7347743e5d...b444813739
2020-04-03 11:54:48 -07:00
Sebastiaan van Stijn
aa76d95375
Bump Golang 1.13.9
...
go1.13.9 (released 2020/03/19) includes fixes to the go command, tools, the
runtime, the toolchain, and the crypto/cypher package. See the Go 1.13.9
milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.9+label%3ACherryPickApproved
full diff: https://github.com/golang/go/compare/go1.13.8...go1.13.9
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-03 19:55:37 +02:00
Phil Estes
1512f0dc29
Merge pull request #4140 from thaJeztah/man_man_man
...
man: move ctr.1 and containerd-config to section 8
2020-04-03 11:02:41 -04:00
Sebastiaan van Stijn
ad090e67e9
man: move ctr.1, containerd-config to section 8, and fix generation
...
I missed this in my previous change: the ctr man page is also
in Section 8, because it's considered an administrative tool,
and containerd-config is related to containerd so updating these
as well.
This commit also fixes naming of the generated files, which was
hard-coded to .1.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-03 12:32:52 +02:00
Maksym Pavlenko
9ba5ea232c
Merge pull request #4138 from dmcgowan/registry-configuration-tools
...
Registry configuration package
2020-04-02 10:13:30 -07:00
Phil Estes
d8153b065a
Merge pull request #4137 from hs0210/work
...
Add unit test for func in remotes/docker/handler.go
2020-04-02 12:24:58 -04:00
Phil Estes
a19a357f91
Merge pull request #4139 from thaJeztah/fix_manpages
...
Makefile: man page: rename containerd.1 to containerd.8
2020-04-02 08:57:47 -04:00
Sebastiaan van Stijn
356782cb47
Makefile: man page: rename containerd.1 to containerd.8
...
The generated file was incorrectly named containerd.1 and should
be in section 8 (see [MAN-PAGES(7)]: Sections of the manual pages)
This patch fixes the filename and updates references to containerd(1)
to refer to containerd(8).
The generated file itself already had the correct section set in its
header, so didn't need updating.
[MAN-PAGES(7)]: http://man7.org/linux/man-pages/man7/man-pages.7.html
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-02 13:52:06 +02:00
Derek McGowan
547301cb0c
Update ctr resolver to use new config package
...
Moved registry host configuration to the config package
and allows support of loading configurations from a
directory when the hosts are being resolved.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-03-31 22:52:10 -07:00
Derek McGowan
17b6050d20
Add Docker resolver configuration package
...
Add configuration toml file format and configuration
function to configure registry hosts from a directory
based configuration. Compatible with Docker registry
certificate loading.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-03-31 22:52:10 -07:00
Akihiro Suda
dc131aa862
support loading certs from a directory
...
Add `remotes/certutil` functions for loading `ca.crt`, `client.cert`, and `client.key` into `tls.Config` from a directory like `/etc/docker/certs.d/<hostname>.
See https://docs.docker.com/engine/security/certificates/ .
Client applications including CRI plugin are expected to configure the resolver using these functions.
As an example, the `ctr` tool is extended to support `ctr images pull --certs-dir=/etc/docker/certs.d example.com/foo/bar:baz`.
Tested with Harbor 1.8.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-31 21:48:08 -07:00
Hu Shuai
c263c5b146
Add unit test for func in remotes/docker/handler.go
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-04-01 11:41:01 +08:00
Phil Estes
e852da5855
Merge pull request #4135 from hs0210/work
...
Add unit test for func in remotes/docker/handler.go
2020-03-31 15:06:58 -04:00
Hu Shuai
c8d9c6f2a6
Add unit test for func in remotes/docker/handler.go
...
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
2020-03-31 11:29:34 +08:00
Michael Crosby
a83927d5f1
Merge pull request #4134 from thaJeztah/bump_bbolt
...
vendor: update go.etcd.io/bbolt v1.3.4
2020-03-30 16:21:55 -04:00
Michael Crosby
e5fc99107a
Merge pull request #4132 from mxpv/linters
...
Move checks to Github actions
2020-03-30 09:25:51 -04:00
Wei Fu
89f9b300d8
Merge pull request #4123 from estesp/no-del-rootdir-ios
...
Correct logic of FIFO cleanup
2020-03-30 18:58:14 +08:00
Sebastiaan van Stijn
fb9e3d9f21
vendor: update go.etcd.io/bbolt v1.3.4
...
full diff: https://github.com/etcd-io/bbolt/compare/v1.3.3...v1.3.4
- Fix unsafe pointer conversions caught by Go 1.14 checkptr
- Fix unexpected delete bucket error: "delete bucket: incompatible value"
- Add support for aix
- Add go.mod
- db.Path() resolves to db.file.Name()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-30 11:15:37 +02:00
Maksym Pavlenko
e4cbbc78bf
Move checks to Github actions
...
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-03-28 18:59:51 -07:00
Akihiro Suda
1c1a08e71a
Merge pull request #4130 from cpuguy83/docs_buildtags
...
Add docs for build tags used by cri.
2020-03-28 04:45:22 +09:00
Brian Goff
c1a218195d
Add docs for build tags used by cri.
...
Since CRI is compiled in with containerd, builders should be aware that
these buildtags are available.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-03-27 11:42:16 -07:00
Michael Crosby
7ef7d1e245
Merge pull request #4129 from crosbymichael/cgroup-idname
...
Allow the id for cgroup metrics to be changed
2020-03-26 14:01:10 -04:00
Michael Crosby
d654dbafac
Allow the id for cgroup metrics to be changed
...
This makes the metrics package more extensible by allowing the default name of
`container_id` to be changed by the package caller.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-03-26 11:55:44 -04:00
Phil Estes
78ab1d13d2
Correct logic of FIFO cleanup
...
Only delete files which are FIFOs and only delete directories
which are empty after deleting FIFOs.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-03-25 14:00:28 -04:00
Phil Estes
7bdec4e47f
Merge pull request #4125 from dims/add-version-numbers-for-newly-tagged-repos
...
Add version numbers for newly tagged repos
2020-03-25 13:14:23 -04:00
Davanum Srinivas
92a36dc10f
Add version numbers for newly tagged repos
...
The following repos have been tagged as v1.0.0:
- 8375c3424e92c8520ef9a93fcdb778
2020-03-25 12:22:35 -04:00
Phil Estes
0c78dacbc5
Move isFifo from process/io to sys/ and make public
...
Make "IsFifo" a public function for use by other parts of containerd
codebase.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-03-25 10:44:17 -04:00
