Commit Graph

9017 Commits

Author SHA1 Message Date
Lantao Liu
f4625ef76c
Merge pull request #593 from Random-Liu/fix-ocicni-commit
I rebased my ocicni fork, and ruin the previous commit...
2018-02-04 12:14:26 -08:00
Trevor Porter
d994d08664 Add time type conversion for 32bit Unix platforms
Ensures the time.Unix function is given int64 arguments

Signed-off-by: Trevor Porter <trkporter@ucdavis.edu>
2018-02-03 22:36:36 +00:00
Derek McGowan
d778dd15d8
Fixes missing whiteout parent directories
Ensures include parents is called for whiteouts

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-02 17:02:14 -08:00
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-03 00:58:54 +00:00
Stephen Day
83cf371556
Merge pull request #2090 from AkihiroSuda/remove-wtf
vendor: update BurntSushi/toml for MIT license
2018-02-02 16:45:41 -08:00
Lantao Liu
2b8800df2b
Merge pull request #592 from Random-Liu/fix-registry-mirror
Fix registry mirror.
2018-02-02 15:37:29 -08:00
Lantao Liu
92995e29e5 Fix registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 22:52:36 +00:00
Michael Crosby
254807da5b
Merge pull request #2092 from dnephin/fix-vendor-validation
Fix vendor validation
2018-02-02 16:51:12 -05:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-02 13:18:51 -08:00
Mike Brown
bec05e31df
Merge pull request #591 from Random-Liu/update-ocicni
Update ocicni to my fork.
2018-02-02 14:30:17 -06:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00
Lantao Liu
d113c16802 Update ocicni to my fork.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 19:45:26 +00:00
Daniel Nephin
2125d8efc3 Fix vendor validation
vendor/ must be removed first, otherwise files added to vendor/ that aren't added to
vendor.conf will not cause the validation to fail.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-02 10:54:21 -08:00
Lantao Liu
34dd28ab32
Merge pull request #586 from Random-Liu/add-ctrcri
Add a separate CLI for cri-containerd `ctrcri`.
2018-02-02 10:43:15 -08:00
Michael Crosby
8ee29a17e6 Bump gc threshold to 40%
Doing tests, this is a better balance for the threshold in reguards to
memory and cpu usage.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-02 11:00:34 -05:00
Lantao Liu
2d61bdbb0a
Merge pull request #588 from Random-Liu/fix-registry-mirror
Use registry-1.docker.io as backup
2018-02-02 01:21:40 -08:00
Lantao Liu
3d94077144 Use registry-1.docker.io as backup
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 07:52:05 +00: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
Lantao Liu
1f1e03e001 Add a separate CLI for cri-containerd ctrcri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 02:54:05 +00:00
Lantao Liu
59816f840f
Merge pull request #583 from Random-Liu/version-in-metadata
Put version into metadata so that version won't be changed across reboot.
2018-02-01 16:09:45 -08:00
Lantao Liu
05a4743d5f
Merge pull request #582 from Random-Liu/use-registry-mirror
Set registry mirror.
2018-02-01 15:23:45 -08:00
Derek McGowan
44f6bc40d4
Merge pull request #2088 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-01 15:19:49 -08:00
Lantao Liu
fb8d1edb5c Put version into metadata so that version won't be changed across
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 23:14:10 +00: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
Derek McGowan
1fd2b5783a
Add overlay options for making cleanup asynchronous
Allow configuring the overlay snapshotter to synchronously
or asynchronously do cleanup. When the driver is integrated
into a garbage collection system, the asynchronous cleanup
can reduce the time of removal and allow the longer disk
cleanup to be handled without locking the snapshotter.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-01 14:56:03 -08:00
Lantao Liu
c298d913b7
Merge pull request #584 from Random-Liu/add-golang-version
Add golang version in `Status` info.
2018-02-01 14:55:59 -08:00
Michael Crosby
db78450e8b Remove grpclogger from log package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 17:20:49 -05:00
Michael Crosby
ea00fc793b Remove protobuf for mount in shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 17:18:40 -05:00
Lantao Liu
7ddd9255b6 Add golang version in Status info.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 20:10:39 +00:00
Lantao Liu
4165c2b8c1
Merge pull request #581 from Random-Liu/update-containerd
Update containerd to fix mount.Lookup.
2018-02-01 11:10:06 -08:00
Lantao Liu
ead704ddd3 Set registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:49:09 +00:00
Derek McGowan
ba61af665d
Merge pull request #2086 from crosbymichael/bump-cgroups
Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5
2018-02-01 10:33:22 -08:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:27:15 +00: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
7e1d8aafee
Merge pull request #1957 from tophj-ibm/check-for-mounts-tests
running tests in a container
2018-02-01 11:39:58 -05:00
Phil Estes
34e24997b2
Merge pull request #2081 from crosbymichael/debug
Allow tcp debug address
2018-02-01 08:15:09 +00:00
Phil Estes
ec14a97f6f
Merge pull request #2080 from crosbymichael/metrics
Update prometheus client and go-metrics
2018-02-01 08:07:50 +00:00
Phil Estes
6570c97942
Merge pull request #2084 from Random-Liu/simplify-mount-lookup
Simplify mount.Lookup.
2018-02-01 08:04:22 +00:00
Derek McGowan
1f5587247b
Merge pull request #2082 from hinshun/refactor-client-push
Refactor client push into helper function
2018-01-31 22:12:15 -08:00
Lantao Liu
d0779a6145 Simplify mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 03:25:05 +00:00
Edgar Lee
e53cdc9a49
Refactor client push into helper function
Signed-off-by: Edgar Lee <edgar.lee@docker.com>
2018-01-31 17:13:54 -08:00
Edgar Lee
d2f073c6f5
Add converter options to convert schema1 manifest to docker schema2 manifest
Signed-off-by: Edgar Lee <edgar.lee@docker.com>
2018-01-31 17:13:12 -08:00
Abhinandan Prativadi
8094fe69d4
Merge pull request #531 from abhi/registry-mirror
Adding Registry Mirror support
2018-01-31 13:01:25 -08:00
abhi
f3ccd85891 Adding Registry Mirror support
This commit aims to add registy mirror support similar to
docker. The UI is similar to docker where user can
provide mirror urls and the image resolves against the provided
mirrors before fetching from default docker regitry mirror url.

Signed-off-by: abhi <abhi@docker.com>
2018-01-31 10:47:34 -08:00
Michael Crosby
55aa0b415b Don't enable debug endpoints in default config
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-31 11:08:51 -05:00
Michael Crosby
98b53e0dd3 Allow tcp debug address
This uses a simple `IsAbs` check to see if we are using an on disk path
for a unix socket vs an address since we do not prefix addresses with
`unix://` or `tcp://`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-31 10:19:33 -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
Phil Estes
fc1913a5a6
Add capability to build manpages from markdown
Adds capability to build the manpages via the go-md2man utility to the
make framework for containerd

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-01-30 19:50:45 -05:00
Derek McGowan
14d402e289
Add overlay cleanup
Updates overlay remove to simply remove the reference, adds
a cleanup method for discarding the directory.
Updates snapshot create to setup the directory structure while
in the transaction, to prevent cleanup from removing directories
which are part of a create.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-30 16:17:41 -08:00
Christopher Jones
f65cdc18a7
Use protobuf and runc setup scripts in .travis.yml
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-01-30 14:44:38 -05:00