github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,432 Commits 3 Branches 2 Tags 112 MiB
75a03e4ce5
Commit Graph

8432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangjianming
116902cd21 fix no-pivot not working in io.containerd.runtime.v1.linux 
Signed-off-by: zhangjianming <zhang.jianming7@zte.com.cn>
 2020-10-12 09:39:59 +08:00
Phil Estes
98a7355507
Merge pull request #4620 from shouhei/master 
Fix typo in examples of registry config
 2020-10-10 13:24:16 -04:00
shouhei
f1a3235e84 Fix typo in examples of registry config 
Signed-off-by: shouhei <shouhei.yamaguchi.be@gmail.com>
 2020-10-11 01:52:16 +09:00
Phil Estes
14277c6df5
Merge pull request #4613 from dmcgowan/update-test-scripts 
Update test build script to push containerd variant
 2020-10-10 10:01:11 -04:00
Phil Estes
71ed61eef9
Merge pull request #4614 from mxpv/refactor 
Refactor pkg packages
 2020-10-09 09:09:13 -04:00
Maksym Pavlenko
3d02441a79 Refactor pkg packages 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-08 17:30:17 -07:00
Derek McGowan
3a6009c001
Update test build script to push containerd variant 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-08 16:32:32 -07:00
Phil Estes
cb9572ee57
Merge pull request #4612 from mxpv/nightly 
Update nightly CI
 2020-10-08 09:11:10 -04:00
Wei Fu
04c4401acb
Merge pull request #4611 from dmcgowan/move-proto-fmt-ci 
Move proto format ci check to proto job
 2020-10-08 19:57:14 +08:00
Maksym Pavlenko
1f50416cd9 Update nightly CI 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 20:48:10 -07:00
Derek McGowan
8b20ca9d9d
Move proto format ci check to proto job 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 20:19:07 -07:00
Akihiro Suda
915263f269
Merge pull request #4502 from akshat-kmr/master 
Add logging binary support when terminal is true
 2020-10-08 12:14:39 +09:00
Derek McGowan
515133671b
Merge pull request #4609 from mxpv/linter 
Enable linter checks on Windows
 2020-10-07 18:16:55 -07:00
Derek McGowan
45d8a7e4a2
Merge pull request #4588 from thaJeztah/remove_redundant_error 
mount.isFUSE(): remove unused error return, and extract FUSE unmount to a function
 2020-10-07 17:21:27 -07:00
Derek McGowan
822ce4e56e
Merge pull request #4608 from mxpv/refactor 
Refactor CRI related packages
 2020-10-07 17:03:20 -07:00
Samarth Shah
5fc721370d Add manifest digest annotation for snapshotters 
Signed-off-by: Samarth Shah <samarthmshah@gmail.com>
 2020-10-07 23:12:01 +00:00
Maksym Pavlenko
c59d1cd5b0 Fix linter issues 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:42:01 -07:00
Maksym Pavlenko
8b046647e6 Use golangci-lint Github Action 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:17:56 -07:00
Maksym Pavlenko
8b03df2dae Enable linter on windows 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 15:08:20 -07:00
Maksym Pavlenko
3508ddd3dd Refactor CRI packages 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-10-07 14:45:57 -07:00
Maksym Pavlenko
944e9b70e2
Merge pull request #4607 from dmcgowan/cleanup-cri-packages 
Move cri server packages under pkg/cri
 2020-10-07 14:05:38 -07:00
Derek McGowan
b22b627300
Move cri server packages under pkg/cri 
Organizes the cri related server packages under pkg/cri

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 13:09:37 -07:00
Akihiro Suda
f44b072781
Merge pull request #4593 from dmcgowan/merge-cri 
Merge cri master
 2020-10-08 03:41:03 +09:00
Derek McGowan
1c60ae7f87
Use local version of cri packages 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:59:40 -07:00
Derek McGowan
e7a350176a
Merge containerd/cri into containerd/containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:58:39 -07:00
Derek McGowan
0820015314 Prepare cri for merge to containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-07 10:58:39 -07:00
Michael Crosby
de546a154f
Merge pull request #4605 from mxpv/nri-fix 
Revendor NRI
 2020-10-07 13:57:37 -04:00
Maksym Pavlenko
d0f6895d8d Revendor NRI 
Signed-off-by: Maksym Pavlenko <mxpv@apple.com>
 2020-10-07 10:34:48 -07:00
Michael Crosby
a0b3b4e4da
Merge pull request #1593 from moolen/fix/add-nri-labels 
Add missing sandbox labels when invoking nri
 2020-10-07 13:17:06 -04:00
Maksym Pavlenko
c408aa9086
Merge pull request #4600 from ktock/repositoryscope 
Allow to use repository scope helper function from other packages
 2020-10-06 13:43:25 -07:00
Phil Estes
bc08a19f3a
Merge pull request #1595 from dmcgowan/fix-unix-lint 
Fix unix lint
 2020-10-06 08:37:01 -04:00
ktock
4b882eb93a Export repository scope helper functions 
`docker.Authorizer` requires library clients to configure scope via context.
It is helpful for the clients to use the helper (currently private) functions
for generating scope string and to use that function with the combination of
other scope-related ones (e.g. `docker.WithScope`).

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-10-06 10:49:01 +09:00
Derek McGowan
6f98abc2a6 Add macos target for lint 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-05 17:46:01 -07:00
Derek McGowan
07c98d0bf1 Fix lint in Unix environments 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-05 17:46:01 -07:00
Moritz Johner
f87302ab20 Add missing sandbox labels when invoking nri plugins 
Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
 2020-10-03 23:30:09 +02:00
Derek McGowan
d852786705
Merge pull request #4599 from estesp/fix-script-var 
Windows CNI install script using lowercase "destdir"
 2020-10-03 10:24:12 -07:00
Phil Estes
615af428a3
Windows CNI install script using lowercase "destdir" 
Fixes packaging via GH Actions script, which sets DESTDIR and is used
across many scripts.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-10-02 16:31:28 -04:00
Mike Brown
d620c30d7e
Merge pull request #1592 from dmcgowan/stricter-lint 
Align lint with containerd
 2020-10-01 14:53:36 -05:00
Akihiro Suda
e3aa6a39c8
Merge pull request #4597 from mc256/patch-1 
Update BUILDING.md - add dependency libseccomp-dev
 2020-10-02 01:02:06 +09:00
Derek McGowan
77cf032195 Enable golangci on Windows 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-01 09:01:16 -07:00
Mike Brown
07cc1af22d
Merge pull request #1591 from hickeyma/impr-img-reg-doc 
Doc (registry): Update to the image registry doc
 2020-10-01 10:43:08 -05:00
Sebastiaan van Stijn
48f64a18be
mount: extract FUSE unmounting to a function 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-10-01 17:29:40 +02:00
mc256
60d24c4a95
Update BUILDING.md - add dependency libseccomp-dev 
I got these errors when I try to build containerd:

```
go build "-mod=vendor" "-buildmode=pie"  -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="a220b9c6cc100f71ddc67152a12fc04622313dca" -X main.version=1.0.0-rc92+dev " -o runc .
Package libseccomp was not found in the pkg-config search path.
Perhaps you should add the directory containing `libseccomp.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libseccomp' found
Package libseccomp was not found in the pkg-config search path.
Perhaps you should add the directory containing `libseccomp.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libseccomp' found
pkg-config: exit status 1
```

Solved this problem by installing one extra dependency `libseccomp-dev`. I am using Ubuntu 20.04 and everything works well!

See also: opencontainers/runc#1032

Signed-off-by: Jun Lin Chen <webmaster@mc256.com>
 2020-10-01 10:59:35 -04:00
Derek McGowan
a3c0e8859c Align lint checks with containerd 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-09-30 23:17:46 -07:00
Derek McGowan
83e6efc6fc Use tabs in protofile indentation 
This is enforced as part of containerd's fmt checks

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-09-30 21:50:33 -07:00
Martin Hickey
fe5fdccdaf Update after review 
Review comments:
- https://github.com/containerd/cri/pull/1591#pullrequestreview-499636859

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-09-30 19:00:08 +00:00
Martin Hickey
70a56ae327 Updates to the image registry doc 
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-09-30 14:51:59 +00:00
Phil Estes
803c5f467d
Merge pull request #4595 from thaJeztah/update_logrus 
vendor: sirupsen/logrus v1.7.0
 2020-09-30 09:24:16 -04:00
Sebastiaan van Stijn
0714e4be98
vendor: sirupsen/logrus v1.7.0 
full diff: https://github.com/sirupsen/logrus/compare/v1.6.0...v1.7.0

removes dependency on github.com/konsorten/go-windows-terminal-sequences

Features:
   * a new buffer pool management API has been added
   * a set of `<LogLevel>Fn()` functions have been added

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-09-30 13:44:50 +02:00
Phil Estes
edfeb46867
Merge pull request #4591 from AkihiroSuda/crun-015 
CI: update crun to v0.15
 2020-09-29 08:50:28 -04:00