Commit Graph

353 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
7c1365b468
bump sirupsen/logrus v1.4.1
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 22:23:53 +02:00
Akihiro Suda
3a80a801af
Merge pull request #3139 from thaJeztah/bump_runc_v1.0.0-rc7
update opencontainers/runc v1.0.0-rc7
2019-03-29 12:32:50 +09:00
Sebastiaan van Stijn
2b8df8309e
bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
full diff: dbea6f2bd4...4994991857

brings in https://github.com/containerd/cgroups/pull/79 Return ErrCgroupDeleted when no subsystems
fixes https://github.com/containerd/containerd/issues/3133 Custom cgroup path does not work in containerd 1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-28 23:36:36 +01:00
Sebastiaan van Stijn
bc6ac08784
update opencontainers/runc v1.0.0-rc7
full diff: 2b18fe1d88...v1.0.0-rc7

changes included:

- opencontainers/runc#2012 Need to setup labeling of kernel keyrings
- opencontainers/runc#2014 Add $RUNC_USE_SYSTEMD to run tests using systemd cgroup driver
- opencontainers/runc#2015 Use getenv not secure_getenv
  - fixes opencontainers/runc#2013 build fails with musl libc
- opencontainers/runc#2023 Fixes regression causing zombie runc:[1:CHILD] processes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-28 21:42:17 +01:00
John Howard
e16e995939 Vendor Microsoft/hcsshim@8abdbb82
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-03-25 11:11:37 -07:00
Justin Terry (VM)
4c9b5ef8ea Update vendor github.com/Microsoft/go-winio
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-03-21 14:12:41 -07:00
Jack Baines
908b771086 Add code to return message field of returned registry errors
Docker registries return errors in a know format so this change now checks for these
errors and returns the message field. If the error is not in the expected format fall
back to the original behaviour.

https://github.com/containerd/containerd/issues/3076

Signed-off-by: Jack Baines <jack.baines@uk.ibm.com>
2019-03-19 21:05:36 +00:00
Sebastiaan van Stijn
b8d40b3535
update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
This includes an improved fix for CVE-2019-5736 to reduce the
increased memory-consumption introduced by the original patch,
RHEL 7.6 getting into a loop due to a kernel bug in those kernels,
and improve compatibility with older kernels.

changes included:

- opencontainers/runc#1973 Vendor opencontainers/runtime-spec 29686dbc
- opencontainers/runc#1978 Remove detection for scope properties, which have always been broken
- opencontainers/runc#1963 Vendor in go-criu and use it for CRIU's RPC definition
- opencontainers/runc#1995 exec: expose --preserve-fds
- opencontainers/runc#2000 fix preserve-fds flag may cause runc hang
- opencontainers/runc#1968 Create bind mount mountpoints during restore
- opencontainers/runc#1984 nsenter: cloned_binary: "memfd" cleanups

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-07 21:30:26 +01:00
Michael Crosby
d2bec5422a Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
This fixes issues for systemd 420 and non-existant cgroups.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-02-26 15:48:10 -05:00
John Howard
d83e4e9b3b Vendor Microsoft/go-winio@v0.4.12
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-21 14:16:51 -08:00
John Howard
fd6ac5d026 Vendor sirupsen/logrus@1.3.0
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-20 20:18:14 -08:00
Sebastiaan van Stijn
14eaad0cd9
Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
Includes 6635b4f0c6,
which fixes a vulnerability in runc that allows a container escape (CVE-2019-5736)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-11 15:18:59 +01:00
Phil Estes
b02ab6c742
Merge pull request #2990 from jhowardmsft/jjh/bumpruntimespec
Vendor opencontainers/runtime-spec 29686dbc
2019-02-10 16:48:05 -08:00
John Howard
98766e863e Vendor opencontainers/runtime-spec 29686dbc
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-07 18:47:53 -08:00
Sebastiaan van Stijn
3538174e60
Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-07 13:11:46 +01:00
Justin Terry (VM)
d63099c4a6 Allow matching shim path side by side with containerd
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 12:49:14 -08:00
Phil Estes
9aac018896
Merge pull request #2957 from Random-Liu/update-cri
Update cri to 4dd6735020.
2019-01-25 12:41:07 -05:00
Lantao Liu
28f8a90bd7 Update cri plugin to 4dd6735020.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-24 18:38:09 -08:00
Justin Terry (VM)
bb32c0f619 Revendor github.com/Microsoft/hcsshim v0.8.4
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-24 13:46:07 -08:00
Brian Goff
0befa457d3 Update ttrpc to support context timeout.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-01-14 20:11:53 -08:00
Lantao Liu
b55c9c6c35 Update cri to 4b4b2abb2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-02 10:50:25 -08:00
Michael Crosby
822ae18b14 Update cgroups to 1152b960fcee041f50df15cdc67c29db
```
1152b960fcee041f50df15cdc67c29dbccf801ef (HEAD -> master, origin/master)
Merge pull request #73 from gliptak/gofmt1
afd5981a16647b45b6dba3a50a88418b576cc17d Gofmt cgroup_test
65ce98b3dfeb0a9a8fecd7e4ebffb24ad0bfe28f Merge pull request #69 from
cclerget/master-weight-pointer
0f372c6d4a65a49c72b0afbd1aee6214637958bf Merge pull request #71 from
JoeWrightss/patch-1
f48bd85c9cbc306fada0cebc3a646a1f1fe99afe Fixs return error message
10cd53efd916e22b9bdea67223d287684f57f1f4 Merge pull request #70 from
gliptak/patch-1
64bade4cea6c438ee51a7a12528225946b42c6ca Take value instead of pointer
value
b49c4713f3824e81bfa67faddcdde1414171b54e Correct ineffassign warning
3bc6dde829bc2dc8d4097ce8ad5acc275de3df06 Merge pull request #68 from
cclerget/master-net_prio-typo
6b552a86e60e31903d3f8f3f494eda71f562cc54 Fix net_prio typo
c0437c3dd5958f74d7f54e9f5def749850b9d6a1 Merge pull request #67 from
gpanouts/get-all-cgroup-tasks
a31a0ff985237eddf30d9fe30a3643c7da4ae912 Add functionality for
retrieving all tasks of a cgroup
82cb49fc1779971dfef4ad696f1453f6f44987b1 Merge pull request #63 from
ChrsMark/lenient-subsystems-checking
7d825b29aecc02bb1e9bede427f8ed62bbc3030d Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb45aec6a2590c7e7f4b84a080602b3e642d Change Load function in order
to be more lenient on subsystems' checking
965bb1da4db7c8ce2690108c5a081562ce7493cb Merge pull request #66 from
crosbymichael/systemdci
ab9ec0e4abde2c2cb999719ff43af2d3b5830f75 (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83b6eb6cf4bc05d7f91ec1eaad57a77d3b6 Merge pull request #59 from
gliptak/patch-1
4479d118c89b5500a08cce7a78bbe822229c1e65 Merge pull request #62 from
estesp/fix-gofmt
9beb998c23f510b1e6670ad7791807eb9aff6741 Merge pull request #61 from
gliptak/patch-3
9a09e5899acc95fabcc620d6489fec674e6dddfa Fix gofmt of systemd.go
84e6e6ed2afdf661cd9dbf47c6f3412b546bc67f Merge pull request #60 from
gliptak/patch-2
e13f6cc3b9637c36e6a8af393b561127498f4be5 Add GoReportCard badge to
README
d124595ee85c245e7c1443fe402adf7ce4f7f6a4 Add Go 1.11 to Travis
d961ab930c38eb8bedcded479f1708b2ef4984c5 Correct typo
d2400726cfa7904fb79e3b896ec0e6ae500a76bd Merge pull request #57 from
estesp/project-update
e4cf832b95deb7ce898ece716307abc35cbd0a09 Add project references and use
common project travis
8baeff6b9d069acde48ef1bedec7e0f8ba684f05 Merge pull request #56 from
grantseltzer/patch-1
9de57ffeb46f6179333d7939436d92dcb5631e5f Add godoc badge to README.md
5017d4e9a9cf2d4381db99eacd9baf84b95bfb14 Merge pull request #54 from
WeiZhang555/bugfix
13aaafdc37e772059d3234ec762303537f440c5b Bugfix: can't write to cpuset
cgroup
58556f5ad8448d99a6f7bea69ea4bdb7747cfeb0 Merge pull request #53 from
baude/systemdslicedelegate
15ed73c1c075e6590ecf56170acedcba0da8167e systemd-239+ no longer allows
delegate slice
3024bc7cc0c88af4b32d38a14444f38e65ab169f Merge pull request #52 from
Sykomaniac/bugfix/slice-name
2596f332e449ea374f0f24a977437116714ce7ef Remove call to unitName
2e2922e146ed53ccf4481c245187b6afe244fded Merge pull request #51 from
containerd/type
0f3de2f77d3b76b3871242fbab2a6116179229af (type) Fix empty device type
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-10 11:58:45 -05:00
Michael Crosby
66c20f2b75 Update runc to 96ec2177ae841256168fcf76954f7177af
This fixes a regression in runc that didn't allow signals being sent to
paused containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-04 11:21:20 -05:00
Justin Terry (VM)
27ba2db109 Revendor github.com/Microsoft/hcsshim to v0.8.3
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-12-03 16:08:05 -08:00
Phil Estes
9e372ff01d
Merge pull request #2836 from jterry75/exe_search_path
Cache shim v2 exec.LookPath results
2018-11-28 11:51:03 +00:00
Sebastiaan van Stijn
97dd5df66f
Update runc to v1.0.0-rc6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-11-28 00:51:18 +01:00
Justin Terry (VM)
09bf314bfd Cache shim v2 exec.LookPath results
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-27 15:11:04 -08:00
Michael Crosby
e1a59ba0fb Update runc to 10d38b660a77168360df3522881e2dc2be
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-11-14 14:02:41 -05:00
Justin Terry (VM)
8e25ca6bf0 Revendor github.com/sirupsen/logrus to v1.0.3
logrus v1.0.3 was the first release that include the change in
terminal_windows.go that stops exec'ing "cmd ver" to obtain the version
information and rather uses the x/sys/crypto/terminal.IsTerminal on the
console fd. On Windows this is a significant performance difference to
avoid the additional process activation of the "cmd ver" for each
invocation of the shim/runhcs executables.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-13 09:27:29 -08:00
Justin Terry (VM)
abd971cfbd Revendor github.com/Microsoft/hcsshim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-11-09 15:51:44 -08:00
Michael Crosby
1cc93460d7 Bump aufs for unsupported errors
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 16:49:48 -04:00
Michael Crosby
1301813f7a Update ZFS for unsupported warnings
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-26 13:52:32 -04:00
Lantao Liu
bee4cc5929 Update cri to f913714917d2456d7e65a0be84962b1ce8acb487.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-22 22:57:25 -07:00
Michael Crosby
d7769daa5e Update runc to 58592df56734acf62e574865fe40b9e53e
This includes fixes for user namespaces as well as a long standing bug
for running docker and containerd inside an lxc container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-16 15:47:41 -04:00
Justin Terry (VM)
3f1d9b2c4f Revendor github.com/Microsoft/hcsshim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-15 13:38:24 -07:00
Justin Terry (VM)
00242e1668 Dismount sandbox VHD on snapshot remove
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 13:35:06 -07:00
Justin Terry (VM)
cce78d4b5d Remove dependency on tar2vhd for LCOW differ
This change no longer requires the use of a UtlityVM on Windows to convert the
layer tar to an ext4 vhd for LCOW. This has a significant performance boost
that makes linux/amd64 layer extraction comparable to native Linux performance.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 11:40:10 -07:00
Lantao Liu
88bfc17d14 Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-05 14:53:17 -07:00
Akihiro Suda
5349fa31df remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-02 13:12:25 +09:00
Justin Terry (VM)
81eb40fabf Adds containerd-shim-runhcs verbose logging support
Revendors to Microsoft/hcsshim v0.7.5 that added support for logging all
runhcs.exe commands via Windows named pipes. This now launches all runhcs.exe
commands and forwards debug logging to the containerd-shim-runhcs log when
with --debug.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Derek McGowan
697ec5d914
Update continuity
Includes fs error changes
Includes removal of unreachable block

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-21 09:14:51 -07:00
Michael Crosby
b01ebaf849
Merge pull request #2674 from crosbymichael/runc
Update runc to 00dc70017d222b178a002ed30e9321b126
2018-09-21 10:21:24 -04:00
Derek McGowan
92d58bf8f0
Merge pull request #2670 from jterry75/runhcs_stop_success
runhcs-shim improvements and fixes to ctr
2018-09-20 15:43:27 -07:00
Michael Crosby
806a8f98bb Update runc to 00dc70017d222b178a002ed30e9321b126
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 18:42:15 -04:00
Michael Crosby
d16cc3a02e Update ttrpc for client timeout support
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 15:28:52 -04:00
Justin Terry (VM)
7768ab1b5e Update runhcs-shim to use go-bindings
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-20 10:40:33 -07:00
Lantao Liu
ab9942cbf9 Update cri to 9f39e32895.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-17 11:37:24 -07:00
Derek McGowan
0dc7636c0b
Merge pull request #2644 from madhanrm/vendor_win
Vendor in runtime spec referencing windows namespace
2018-09-14 18:06:29 -07:00
Madhan Raj Mookkandy
744d93e960 Vendor in runtime spec referencing windows namespace
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
2018-09-13 18:03:18 -07:00
John Howard
f1cc4feea6 Vendor go.etcd.io/bbolt @ v1.3.1-etcd.8
Signed-off-by: John Howard <jhoward@microsoft.com>

This is the maintained version of boltdb, which includes the Windows-specific fix
detailed in https://github.com/etcd-io/bbolt/pull/122
2018-09-12 15:32:13 -07:00
Michael Crosby
906acb18b6 Don't provide IO when it's not set
This makes sure that runc does not get any valid IO for the pipe.  Some
builds and other containers will be stuck if they inspect stdin
expecially and its a pipe but not connected to any user input.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-07 18:30:31 -04:00
Michael Wan
93d3f065ac vendor: update vendor containerd/aufs to commit ffa3997
Signed-off-by: Michael Wan <zirenwan@gmail.com>
2018-08-29 07:30:31 -04:00
Michael Wan
55842b1713 vendor: update github.com/containerd/continuity commit to f44b615
Signed-off-by: Michael Wan <zirenwan@gmail.com>
2018-08-29 05:43:13 -04:00
Justin Terry (VM)
57979e1ed2 revendor go-runc to acb7c88c
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-23 10:33:30 -07:00
Michael Crosby
d6cd1e5379 Update console dep to c12b1e7919c14469339a5d38f2f8
This fixes interactive consoles in windows

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-22 13:33:01 -04:00
Justin Terry (VM)
019b0c34de Introduce containerd-shim-runhcs-v1 on Windows
Implements the containerd-shim-runhcs-v1 shim on Windows for the runtime
v2 shim API.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-08-22 08:15:43 -07:00
John Howard
8fe92ea5f3 Revendor Microsoft/hcsshim and go-winio
Signed-off-by: John Howard <john.howard@microsoft.com>
2018-08-20 11:31:28 -07:00
Derek McGowan
ddc53c9cd2
Update runc vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-08-17 13:22:56 -07:00
Lantao Liu
e9ad2d0481 Update cri to v1.11.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-08-09 18:59:41 +00:00
Michael Crosby
5a47c5ec1d Add lib support as an option
Some images like `criu` will have extra libs that it requires.  This
adds lib support via LD_LIBRARY_PATH and InstallOpts

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-08-02 17:11:29 -04:00
Michael Crosby
5a0b040ab4 Update containerd dependencies for 1.2
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-26 15:00:59 -04:00
Derek McGowan
4c2ad9cefb
Update CRI vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-18 10:43:37 -07: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
Michael Crosby
6a83168157 Update ttrpc to 94dde388801693c54f88a6596f713b51a8
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-02 15:24:15 -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
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
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
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
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
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
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
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
8d768689fa cri vendor bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:15:24 -04:00
Derek McGowan
d2fc059229
Update grpc to 1.12
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-25 13:22:18 -07:00
Michael Crosby
024a4210c7 Update continuity to d3c23511c1bf5851696cba83143d9
This includes updates for resolving links on windows.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-25 14:50:32 -04:00
Brian Goff
7e5a91fa51 Bump continuity to fix copy files > 2^32 bytes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-05-23 20:53:14 -04:00
Darren Stahl
07d8716004 Update hcsshim to v0.6.10
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-05-02 16:19:15 -07:00
Ian Campbell
623407a399 Re-vndr with newest vndr
This seems to pickup a bunch of *.c files and some other changes which follow
from having included some new packages because of that.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-05-01 00:18:17 +01:00
Ian Campbell
388c73052a Bump to latest go-digest.
This renames the license file (so automated tooling can find it, which I care
about) and also pulls in some documentation and comment changes, plus some
functional changes:

PR#33 -- future-proof the algorithm field.
PR#34 -- disallow upper case in hex portion.

No changes appear to be required to containerd code.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-04-30 23:38:02 +01:00
Andrei Vagin
0846d6f8e9 vendor: update go-runc
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-27 23:45:54 +03:00
Lantao Liu
9c9abec21c Update cri plugin to v1.0.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-23 16:34:17 -07:00
Lantao Liu
6da553e112 Update cri plugin to v1.0.0-rc.2.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-13 07:01:48 +00:00
Stephen J Day
caac3bca3e
protobuf: remove generated google/rpc files
We move from having our own generated version of the googleapis files to
an upstream version that is present in gogo. As part of this, we update
the protobuf package to 1.0 and make some corrections for slight
differences in the generated code.

The impact of this change is very low.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-04-05 14:36:32 -07:00
Lantao Liu
89d74986cc Update cri plugin to v1.0.0-rc.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 21:11:38 +00:00
Derek McGowan
ac5432a06b
Merge pull request #2253 from stevvooe/report-zfs-correctly
vendor: update zfs dependency
2018-03-29 18:30:57 -07:00
Stephen J Day
ca4ccf4afc
vendor: update zfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 14:48:12 -07:00
Stephen J Day
bea2304ca4
vendor: update aufs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 13:33:10 -07:00
Lantao Liu
8958b489ba Update to cri v1.0.0-rc.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 22:24:25 +00:00
Stephen J Day
ab8e05ac50
cmd/containerd: include aufs by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 11:27:12 -07:00
Michael Crosby
3e8e9d3ed7
Merge pull request #2223 from dmcgowan/with-lease-context
lease: pass in context to lease done function in client
2018-03-23 10:27:39 -04:00
Derek McGowan
43d0a5cb60
Pass in context to lease done function in client
Allows the client to choose the context to finish the lease.
This allows the client to switch contexts when the main context
used to the create the lease may have been cancelled.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 14:09:24 -07:00
Derek McGowan
9b111bdc39
Add ignore socket test
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 13:17:33 -07:00
Phil Estes
f5d7bfb56e
Merge pull request #2213 from crosbymichael/runc
Bump runc to 69663f0bd4b60df09991c08812a60108003fa
2018-03-16 12:54:54 +02:00
Michael Crosby
f117459c35 Bump runc to 69663f0bd4b60df09991c08812a60108003fa
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-15 14:14:41 -04:00
Stephen J Day
f4113a903a
containerd: include zfs plugin by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-14 10:29:23 -07:00
Lantao Liu
9460f94c10 Update containerd/cri to 0c87604068
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-14 01:11:29 +00:00
Stephen Day
3013762fc5
Merge pull request #2203 from Random-Liu/support-in-process-integration
Support in process integration
2018-03-12 14:38:27 -07:00
Lantao Liu
ba93435337 Temporary cri-containerd change
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-12 18:03:50 +00:00
Phil Estes
e38b2bbc3f
Update cgroups vendor for license headers/bug fix
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-03-09 15:54:13 -05:00
Michael Crosby
179382028a Update containerd deps
This includes general fixes and the license change where the license is
included in all files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-08 13:57:30 -05:00
Stephen J Day
23751c9ced
vendor: update btrfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-06 13:16:56 -08:00
Stephen J Day
9cdd036393
build: bump to Go 1.10
Bumps the build to use Go 1.10, which allows us to drop the forked tar
package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-26 16:47:24 -08:00
Lantao Liu
ad04781e3e Update cri-containerd to 5bd99af7db
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-24 00:09:26 +00:00
Derek McGowan
5bd99af7db
Merge pull request #2097 from Random-Liu/vendor-cri-plugin
Vendor cri plugin into containerd.
2018-02-23 13:55:13 -08:00
Eli Uriegas
735114f500 Update continuity vendor to d8fb85
Includes a fix for 32bit systems

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-02-17 00:23:42 +00:00
Lantao Liu
fa91b905e9 Update vendors.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-16 23:23:47 +00:00
Derek McGowan
ca3eb742fd
Update continuity vendor
Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-12 10:45:15 -08:00
Daniel Nephin
1719a6e17a Vendor gotestyourself
and remove testify and spew

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:23 -05:00
Stephen Day
ee6ffdd91e
Merge pull request #2116 from crosbymichael/bump-runc
Update runc to a618ab5a0186905949ee463dbb762c3d23e
2018-02-08 15:09:43 -08:00
Michael Crosby
73837b11db Update runc to a618ab5a0186905949ee463dbb762c3d23e
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-08 11:30:24 -05:00
Brian Goff
c776b6d8d9 Use continuity fs package
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-07 12:40:52 -05:00
Michael Crosby
9745a4d448 Update ttrpc to d4528379866b0ce7e9d71f3eb96f0582fc
Contains the OnClose method for the client

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-06 10:27:36 -05:00
Akihiro Suda
36a2deb029 vendor: update BurntSushi/toml for MIT license
Follow-up to #2088

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-02 15:51:57 +09:00
Stephen J Day
85678e1885
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-01 14:58:31 -08:00
Michael Crosby
5915c9ab5e Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5
This fixes performance issues with walking `/dev` to get device paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 11:43:42 -05:00
Michael Crosby
7615153271 Update prometheus client and go-metrics
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-31 10:12:41 -05:00
Michael Crosby
2f06259a84 Revert "Add github.com/json-iterator/go to vendor"
This reverts commit 43a9473a53.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-29 15:47:58 -05:00
Michael Crosby
43a9473a53 Add github.com/json-iterator/go to vendor
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:32:55 -05:00
Michael Crosby
8f75d658d7 Add syndtr/gocapability to vendor
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 14:31:19 -05:00
Stephen J Day
f534a20173
vendor: update go-runc to reduce gc pressure
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-24 16:19:24 -08:00
Michael Crosby
8dfbd59e60 Update runc to 9f9c96235cc97674e935002fc3d78361b69
This fixes issues for init and exec hanging forever when an error
happends on start.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-23 10:05:26 -05:00
Stephen J Day
87cb12de32
vendor: update ttrpc for shutdown fix
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-09 16:13:43 -08:00
Michael Crosby
e479165a38
Merge pull request #1903 from darrenstahlmsft/ArchiveOpts
Implement Archive.apply on Windows
2018-01-02 16:08:36 -05:00
Michael Crosby
a0f7bbb103 Update runc to 7f24b40cc5423969b4554ef04ba0b00e2
This includes fixes for file joining and apparmor without cgo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 11:30:22 -05:00
Darren Stahl
c71bee7b8a Vendor go-winio
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-12-11 11:43:42 -08:00
Sebastiaan van Stijn
8b1fd0875a Bump runtime-spec and image-spec to 1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-05 23:12:36 -08:00
Sebastiaan van Stijn
0eec9c078a
Fix missing libcontainer syscall file
I noticed this file showed up when revendoring dependencies
with vndr.

Also removed `github.com/Microsoft/opengcs` from vendor.conf
as it was not used;

    2017/12/05 22:41:58 WARNING: package github.com/Microsoft/opengcs is unused, consider removing it from vendor.conf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-05 22:52:50 -08:00
Stephen J Day
4b36430425
vendor: update ttrpc to pull in euid change
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-01 12:08:15 -08:00
Stephen J Day
2d966df174
cmd/containerd-shim: require unix socket credentials
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-30 20:34:29 -08:00
Kenfe-Mickaël Laventure
6bff39c643
Merge pull request #1837 from crosbymichael/bump-cgroups
Update cgroups to 29da22c6171a4316169f9205ab6c49f5
2017-11-30 08:03:22 -08:00
Michael Crosby
4349df4554 Update cgroups to 29da22c6171a4316169f9205ab6c49f5
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 10:15:37 -05:00
Stephen J Day
393cf8e8fc
vendor: update ttrpc with latest changes
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-29 21:37:50 -08:00
Darren Stahl
444e4220c2
Revendor hcsshim and go-tar
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-11-28 16:19:56 -08:00
Stephen J Day
d54961ccaa
vendor: add ttrpc as vendored dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-27 18:22:37 -08:00
Stephen J Day
50532f231a
api: use weak imports for plugin protobufs
Because of a side-effect import, we have the possibility of pulling in
several unnecessary packages that are used by the plugin and not at
runtime to implement protobuf structures. Setting these imports to
`weak` prevents this from happening, reducing the total import set,
reducing memory usage and binary size.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-16 20:18:15 -08:00
Stephen J Day
f4fdb940ed vendor: include require package from testify
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-16 16:13:13 -05:00
Stephen J Day
35697865c0
vendor: update protobuf, grpc and gogo
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-09 13:24:41 -08:00
Michael Crosby
9d05197f96 Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 15:17:22 -04:00
Michael Crosby
8feebb7513 Bump runc to 74a17296470088de3805e138d3d87c62e613d
This bumps the runc version to 74a17296470088de3805e138d3d87c62e613dfc4
that includes various fixes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 10:58:04 -04:00
Kenfe-Mickael Laventure
7c9be56930
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
This fixes a leak of the oom_control eventfd to child processes.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-19 07:55:16 -07:00
Kenfe-Mickael Laventure
90c535521a
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
This fixes possible panics in Run & Restore when done without IOs

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-18 13:24:12 -07:00
Michael Crosby
d805f77f50 Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-12 14:24:16 -04:00
Kenfe-Mickael Laventure
c807ba8379
Allow setting the uid & gid of the io pipes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-10 13:24:12 -07:00
Lantao Liu
28ca8f05d3 Fix task load.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-05 21:03:24 +00:00
Michael Crosby
cf2c4609bd Bump runc with console change for ONLCR
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-26 11:01:40 -04:00