Commit Graph

3757 Commits

Author SHA1 Message Date
Dave Henderson
9a97ab34ce
Switching from crypto/rand to math/rand to avoid blocking
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2018-07-11 16:24:51 -04:00
Derek McGowan
b382b6fe0b
Merge pull request #2450 from Random-Liu/support-host-in-resolver
Support specifying host in resolver.
2018-07-10 18:29:49 -07:00
Lantao Liu
c8a8a49584 Support specifying host in resolver.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-07-09 18:26:02 -07:00
Kenfe-Mickaël Laventure
01d309e8f2
Merge pull request #2448 from rn/btrfs
test: Increase btrfs loopback device size to 128MB
2018-07-09 07:18:52 -07:00
Rolf Neugebauer
651920405e test: Increase btrfs loopback device size to 128MB
With btrfs-prog 4.17 as shipped with Alpine 3.8 the btrfs tests
fail with:

  ERROR: '/dev/loop1' is too small to make a usable filesystem
  ERROR: minimum size for each btrfs device is 114294784

btrfs-prog commit 997f9977c243 ("btrfs-progs: mkfs: Prevent
temporary system chunk to use space in reserved 1M range")
changed the code to compute the minimum size for a btrfs size
and is the likely reason for this error.

Increase the size of the loop back device to 128MB for
the btrfs test.

With this fix, the containerd tests pass on Alpine 3.8,
tested in LinuxKit with kernel 4.14.53.

fixes #2447

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-08 10:53:03 +01:00
Michael Crosby
b41633746e
Merge pull request #2443 from thaJeztah/mask_acpi
Add /proc/acpi and /proc/keys to masked paths
2018-07-06 14:18:34 -04:00
Sebastiaan van Stijn
fe64b06a6d
Add /proc/keys to masked paths
This leaks information about keyrings on the host. Keyrings are
not namespaced.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-06 18:46:45 +02:00
Sebastiaan van Stijn
8b42adeddc
Add /proc/acpi to masked paths
relates to CVE-2018-10892

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-06 18:38:47 +02:00
Michael Crosby
e01779a0da
Merge pull request #2442 from thaJeztah/bump_containerd_console
update containerd/console to fix race: lock Cond before Signal
2018-07-06 11:58:22 -04:00
Sebastiaan van Stijn
77a26427c3
update containerd/console to fix race: lock Cond before Signal
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-06 17:26:22 +02:00
Kenfe-Mickaël Laventure
5900361791
Merge pull request #2420 from sudeeshjohn/master
Fixing the formatting directives error during compilation
2018-07-05 08:29:07 -07:00
sudeesh john
5a4f007e48 Fix the formatting directives error during compilation
Signed-off-by: Sudeesh John <sudeesh@linux.vnet.ibm.com>
2018-07-05 20:40:21 +05:30
Michael Crosby
0b0b41298a
Merge pull request #2437 from thaJeztah/remove_go_version_check
Remove Go version check in travis
2018-07-05 09:57:00 -04:00
Sebastiaan van Stijn
383d750d4f
Workaround for gofmt change in Go 1.11
Go 1.11 uses a different formatting for maps, and now
aligns values; running `gofmt -s -w` on this file resulted
in this diff;

```patch
 content/testsuite/testsuite.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
index 974c7cb8ed..d9ae9dc160 100644
--- a/content/testsuite/testsuite.go
+++ b/content/testsuite/testsuite.go
@@ -365,8 +365,8 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {

 	rootTime := time.Now().UTC().Format(time.RFC3339)
 	labels := map[string]string{
-		"k1": "v1",
-		"k2": "v2",
+		"k1":                    "v1",
+		"k2":                    "v2",
 		"containerd.io/gc.root": rootTime,
 	}

@@ -402,7 +402,7 @@ func checkLabels(ctx context.Context, t *testing.T, cs content.Store) {
 	}

 	info.Labels = map[string]string{
-		"k1": "v1",
+		"k1":                    "v1",
 		"containerd.io/gc.root": rootTime,
 	}
 	preUpdate = time.Now()
```

Adding a whitespace before the long key to make it format the same
on both Go 1.11 and older versions of Go.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-05 11:05:30 +02:00
Sebastiaan van Stijn
108c9cd4cf
Remove Go version check in travis
containerd now only supports Go 1.10+, and travis is not
configured to run on older versions, so this check became
redundant.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-05 10:56:57 +02:00
Kenfe-Mickaël Laventure
39b6ba826a
Merge pull request #2431 from masters-of-cats/plugins-list-subcommand
Introduce plugins/list subcommand
2018-07-02 13:38:39 -07:00
Kenfe-Mickaël Laventure
4e64dcce85
Merge pull request #2432 from crosbymichael/ttrpc2
Update ttrpc to 94dde388801693c54f88a6596f713b51a8
2018-07-02 13:37:50 -07:00
Michael Crosby
6a83168157 Update ttrpc to 94dde388801693c54f88a6596f713b51a8
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-02 15:24:15 -04:00
Danail Branekov
3cf3881fa4 Introduce plugins/list subcommand
`Ctr` interface follows the pattern `ctr <command> <subcommand>` except
for the `plugins` command which does not have subcommands. This feels
unnatural to certain users and they would expect that they can list
containerd plugins via `ctr plugins list`.

This commit implements their expectation so that `plugins` becomes a
command "group" and its `list` subcommand actually lists the plugins.

Signed-off-by: Danail Branekov <danailster@gmail.com>
2018-07-02 10:20:20 +03:00
Phil Estes
a044b047e8
Merge pull request #2430 from Random-Liu/update-cri-to-v1.11.0
Update cri to v1.11.0.
2018-06-28 16:25:26 -04:00
Lantao Liu
f530a3c267 Update cri to v1.11.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-06-28 18:29:10 +00:00
Kenfe-Mickaël Laventure
e51ddf43e9
Merge pull request #2428 from crosbymichael/ttrpc
Update ttrpc and typeurl packages
2018-06-28 10:19:39 -07:00
Michael Crosby
8c709ac43a update typeurl
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-28 10:05:30 -04:00
Michael Crosby
08150bfe76 Update ttrpc for containerd repo
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-28 09:53:40 -04:00
Alban Crequy
6ef65b74e1 Document how to use systemd-run
It is also useful when testing local changes, I just run:

sudo systemd-run -p Delegate=yes -p KillMode=process bin/containerd

Signed-off-by: Alban Crequy <alban@kinvolk.io>
2018-06-27 16:58:30 +02:00
Michael Crosby
ca204317ed
Merge pull request #2422 from crosbymichael/ctr-delete
Add cio.Load for loading io set
2018-06-27 08:46:18 -04:00
Kenfe-Mickaël Laventure
08f7ee9828
Merge pull request #2423 from crosbymichael/shim-procs
Set shim max procs via env var
2018-06-26 10:40:40 -07:00
Michael Crosby
fdceb13b14 Add cio.Load for loading io set
This adds a `Load` Opt for cio to load a tasks io/fifos without
attaching or starting the copy routines.

It adds the load method in `ctr` by default so that fifos or other IO
are removed from disk on delete methods inbetween command runs.  It is
not the default for all task loads for backwards compat. and a user may
want to keep io around to reuse or if log files are used.

Fixes #2421

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-26 11:48:26 -04:00
Michael Crosby
68e144c637 Set shim max procs via env var
This sets the shim's max procs to 2, like we already have hard coded in
the shim, with the env var so that it is set at go runtime boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-26 10:49:59 -04:00
Stephen Day
1ac546b3c4
Merge pull request #2411 from flx42/move-containerflags
Move ContainerFlags to "commands" package
2018-06-25 13:37:35 -07:00
Michael Crosby
e239f65590 Handle abs path for rootfs in oci hook
Fixes #2412

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-25 14:10:17 -04:00
Michael Crosby
f15c3be348
Merge pull request #2417 from dmcgowan/update-arm64-normalize
Normalize arm64 to an empty variant
2018-06-25 11:45:14 -04:00
Derek McGowan
db3c5afc6d
Normalize arm64 to an empty variant
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-23 16:35:46 -07:00
Derek McGowan
47a128d455
Merge pull request #2414 from dmcgowan/platform-arm-normalization
Fix arm platform matching
2018-06-22 13:15:23 -07:00
Phil Estes
995310cda9
Merge pull request #2408 from estesp/carry-2363
Update architecture.md (Carry PR 2363)
2018-06-22 11:49:23 -04:00
Derek McGowan
7049671465
Add support for proxy plugins in configuration
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-21 18:57:42 -07:00
Derek McGowan
37ab93e2c8
Fix arm platform matching
The normalization was being inconsistently applied causing a
failure to match some platforms in manifest lists.
Fix the matcher and normalization to be more consistent and
add changes to parser to prevent the defaulted variants from being
set in the platform structure.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-21 17:07:58 -07:00
Phil Estes
7ff2748f9c
Merge pull request #2410 from tonistiigi/mlist-error
images: provide better error for manifest list match error
2018-06-20 23:03:37 -04:00
Felix Abecassis
5dd22a20af Move ContainerFlags to "commands" package
Commit 05513284e7 exposed the "rootfs"
and "no-pivot" flags for the "containers" command, but it accidentally
removed them for "run" since package-level variables are initialized
before package-level init functions in golang. Hoisting these flags to
a package imported by both commands solves the problem.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2018-06-20 18:33:59 -07:00
Tonis Tiigi
53fe31d6de images: provide better error for manifest list match error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-20 13:43:27 -07:00
Andrew Osheroff
3c5b0dcf27
Update architecture.md
Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-06-19 18:13:14 -04:00
Phil Estes
c1e1f3d6d9
Merge pull request #2397 from harche/doc_fix
Docs: Fix incomplete instructions for building using docker
2018-06-13 17:37:41 -07:00
Harshal Patil
ef449aa38e Docs: Fix incomplete instructions for building using docker
Fixes: #2396

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-06-13 13:38:57 +05:30
Kenfe-Mickaël Laventure
0158a6fb34
Merge pull request #2393 from vdemeester/gotestyourself-with-tools
Update gotestyourself to gotest.tools
2018-06-11 07:35:25 -07:00
Vincent Demeester
832b05ae67
Update tests to use gotest.tools angel
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 21:02:01 +02:00
Vincent Demeester
3830180ce5
Replace gotestyourself by gotest.tools
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 21:00:45 +02:00
Michael Crosby
35887db096
Merge pull request #2370 from dmcgowan/update-maintainers-rules
Update adding maintainer section
2018-06-08 10:22:58 -04:00
Derek McGowan
7ba62b147d
Update adding maintainer section
Updates the maintainers file to align with the process
we have been following for adding maintainers and reviewers.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-07 16:05:57 -07:00
Derek McGowan
63522d9eaa
Merge pull request #2390 from AkihiroSuda/fix-schema1
fix schema1 fetchBlob()
2018-06-07 09:34:15 -07:00
Michael Crosby
356b0d5964
Merge pull request #2388 from ehazlett/proc-interface
Separate proc interfaces into standalone package
2018-06-07 11:12:10 -04:00