Commit Graph

4032 Commits

Author SHA1 Message Date
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
frank yang
046536cfb1 fixbug: blob for schemav1 could be uncompressed
Signed-off-by: frank yang <yyb196@gmail.com>
2018-06-08 11:50:54 +08: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
Phil Estes
df34eefa12
Merge pull request #2330 from crosbymichael/hpc
Add nvidia gpu support
2018-06-07 10:10:20 -04:00
Evan Hazlett
a435f2886c separate proc interfaces into standalone package
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-06-07 10:03:15 -04:00
Akihiro Suda
703c25e452 fix schema1 fetchBlob()
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-07 17:51:41 +09:00
Derek McGowan
00d4910633
Merge pull request #2387 from ehazlett/runtime-shim
Move runtime/linux/shim -> runtime/shim
2018-06-06 13:38:52 -07:00
Evan Hazlett
821c8eaa91
runtime/linux/shim -> runtime/shim
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-06-06 14:35:06 -04:00
Michael Crosby
437e90aa5e
Merge pull request #2386 from northtyphoon/bindu/acr-push-location
docker/pusher: handle location string containing path and query
2018-06-05 18:54:29 -04:00
Bin Du
9b865d86a9 docker/pusher: handle location string containing path and query
Signed-off-by: Bin Du <bindu@microsoft.com>
2018-06-05 19:25:19 +00:00
Phil Estes
081b2d6330
Merge pull request #2384 from crosbymichael/bump-console
Bump console for windows tty handling
2018-06-05 18:32:00 +03:00
Michael Crosby
0cfca1e633 Bump console for windows tty handling
ref: https://github.com/containerd/console/pull/25

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-05 10:14:41 -04:00
Michael Crosby
0d7fd3f7ad
Merge pull request #2383 from AkihiroSuda/vendor-cri-20180605
update cri vendor
2018-06-05 09:39:03 -04:00
Akihiro Suda
135a4d9104 update cri vendor
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-05 16:54:32 +09:00
Phil Estes
84bebdd91d
Merge pull request #2379 from dmcgowan/fix-direct-io-terminal-setting
Fix creation of DirectIO overwriting fifo config
2018-06-02 12:25:14 +03:00
Phil Estes
b867977c01
Merge pull request #2380 from dmcgowan/ignore-zero-msg-size-configs
Ignore zero max message size in grpc config
2018-06-02 12:22:04 +03:00
Derek McGowan
993d4b8fc5
Ignore zero max message size in grpc config
Fixes upgrade issue where existing configs cause
the max message size to get set to 0.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-01 16:21:53 -07:00
Derek McGowan
6b9be1bfc3
Fix creation of DirectIO overwriting fifo config
Creating a direct IO should not overwrite the fifo
configuration. The fifo configuration can be updated
before creating the direct io if needed.
This fixes an expected change in behavior for clients
who were calling NewDirectIO previously with terminal
configured on the fifo.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-01 16:04:22 -07:00
Michael Crosby
5b1f69be8a
Merge pull request #2135 from AkihiroSuda/oci-content-store
content: change Writer/ReaderAt to take OCI descriptor
2018-06-01 13:14:35 -04:00
Michael Crosby
e1428ef054
Merge pull request #2378 from thaJeztah/update_microsoft_vendors
Update go-winio and hcsshim
2018-06-01 12:30:00 -04:00
Sebastiaan van Stijn
55118c5469
Update go-winio and hcsshim
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-01 18:04:25 +02:00
Akihiro Suda
d88de4a34f content: change Writer/ReaderAt to take OCI
This change allows implementations to resolve the location of the actual data
using OCI descriptor fields such as MediaType.

No OCI descriptor field is written to the store.

No change on gRPC API.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-01 11:51:43 +09:00
Michael Crosby
e4ad710ce8
Merge pull request #2375 from AkihiroSuda/update-cri-20180531
update cri vendor
2018-05-31 10:44:02 -04:00
Akihiro Suda
17a54d02c4 update cri vendor
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-05-31 17:37:16 +09:00
Derek McGowan
1e8b09cfc6
Merge pull request #2353 from ehazlett/process-runtime
linux -> runtime/linux
2018-05-30 10:06:36 -07:00
Michael Crosby
c7083eed5d
Merge pull request #2369 from dmcgowan/update-grpc
Update grpc to 1.12
2018-05-30 11:07:10 -04:00
Evan Hazlett
6653917ef9 vendor update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:23:10 -04:00
Evan Hazlett
cae94b930d linux -> runtime/linux
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:23:10 -04:00