Commit Graph

4032 Commits

Author SHA1 Message Date
Michael Crosby
fd2e1f6dec
Merge pull request #2162 from stevvooe/use-go1.10
build: bump to Go 1.10
2018-02-27 15:41:55 -05:00
Akihiro Suda
fffc111ba8 archive: fix logic for skipping mknod when running in userns
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-28 03:01:02 +09:00
Michael Crosby
25c403415a
Merge pull request #2151 from Random-Liu/fix-load-task
Fix task load.
2018-02-27 11:10:45 -05: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
4ac4fd0b6a Close io after task deletion to avoid race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-26 22:12:59 +00:00
Stephen Day
0273e970a4
Merge pull request #2161 from IRCody/cio_panic
Fix panics in cio/io_unix.go
2018-02-26 13:45:45 -08:00
Michael Crosby
0b86dfbc83
Merge pull request #2156 from Random-Liu/update-cri-containerd
Update cri containerd
2018-02-26 15:19:28 -05:00
Lantao Liu
4c903c356b Update critools and run critest in parallel.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-26 19:41:04 +00:00
Cody Roseborough
4c5ebfee96 Fix panics in cio/io_unix.go
Add nil checks before closing fifos to avoid panic when fifo was never
opened.

Signed-off-by: Cody Roseborough <crrosebo@amazon.com>
2018-02-26 19:22:36 +00:00
Ian Campbell
f48cc7d7fe ctr: unpack the image on run if necessary
Without this `ctr run` can fail with:

    ctr: parent snapshot sha256:70798fd80095f40b41baa5d107fb61532bfe494d96313fea01e8fcbf4e8743ee does not exist: not found

My image was produced by buildkit, which doesn't unpack (I think this makes
sense since buildkit doesn't know if I am going to run the image or export/push
it etc).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-02-26 14:23:28 +00: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
Derek McGowan
a1a67899f8
Shared content across namespaces
Update content ingests to use content from another namespace.
Ingests must be committed to make content available and the
client will see the sharing as an ingest which has already
been fully written to, but not completed.

Updated the database version to change the ingest record in
the database from a link key to an object with a link and
expected value. This expected value is used to indicate that
the content already exists and an underlying writer may
not yet exist.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-22 14:45:10 -08:00
Derek McGowan
b3aeba7062
Allow test runners to wrap contexts
Let the test runners choose the namespaces and
wrap the contexts. This allows the test suite to create
multiple contexts without worrying about namespacing
or leasing in the contexts.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-22 14:45:10 -08:00
Michael Crosby
9463fcbbe7
Merge pull request #2152 from cpuguy83/remove_useless_log
Remove erroneous log message
2018-02-22 12:46:10 -05:00
Brian Goff
c520ac5f87 Remove erroneous log message
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-22 12:14:14 -05:00
Derek McGowan
3b4fcf771a
Merge pull request #2112 from crosbymichael/temp-mounts
Add temp mount location to manage temp mounts
2018-02-21 12:56:23 -08:00
Derek McGowan
fc87dce767
Merge pull request #2149 from crosbymichael/reconnect
Add client.Reconnect API
2018-02-21 12:52:08 -08:00
Michael Crosby
7b653dc9ed Add client.Reconnect API
This adds a reconnect api to the client so that the client instance
stays the same and on reconnect, all tasks and containers with
references to the *Client have the correct connection.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-21 11:18:02 -05:00
Michael Crosby
255ad41cfc
Merge pull request #2008 from thaJeztah/bump-golang-to-1.10
Bump to Go 1.10
2018-02-21 10:07:18 -05:00
Sebastiaan van Stijn
b17bcb7284
Regenerate protos with Go 1.10, and make check conditional
Gofmt changed in Go 1.10, so regenerating with the new formatting.
From the Go 1.10 release notes: https://golang.org/doc/go1.10#gofmt

> Gofmt
> ... Second, single-method interface literals written on a single line,
> which are sometimes used in type assertions, are no longer split onto multiple lines.

The travis configuration was updated to skip `check-protos` on Go 1.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 10:51:43 +01:00
Sebastiaan van Stijn
931000c041
Bump to Go 1.10
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 10:50:05 +01:00
Kenfe-Mickaël Laventure
916cdb41a1
Merge pull request #2147 from darrenstahlmsft/RemoveServicing
Removing Windows servicing containers
2018-02-20 19:13:34 -08:00
Akihiro Suda
56ebee8368
Merge pull request #2146 from crosbymichael/pid-file
Add --pid-file to `ctr`
2018-02-21 11:39:45 +09:00
Darren Stahl
243467aa96 Removing Windows servicing containers
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-02-20 16:56:13 -08:00
Michael Crosby
d3a8055e2d Add --pid-file to ctr
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-20 15:10:50 -05:00
Michael Crosby
129167132c
Merge pull request #2108 from kunalkushwaha/license-header
Licence header added
2018-02-20 09:56:21 -05:00
Phil Estes
5a86e83d83
Merge pull request #2142 from seemethere/update_continuity
Update continuity vendor to d8fb85
2018-02-19 14:34:14 -05:00
Kunal Kushwaha
b12c3215a0 Licence header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-02-19 10:32:26 +09: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
Lantao Liu
809a99a39e Vendor cri plugin and add critest
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-16 23:23:47 +00:00
Akihiro Suda
6a50dca196
Merge pull request #2141 from estesp/with-linuxns
Add --with-ns flag to ctr run/create
2018-02-17 06:01:40 +09:00
Phil Estes
e4e53bf486
Add --with-ns flag to ctr run/create
Adds a useful flag to `ctr` to enable joining any existing Linux
namespaces for any namespace types (network, pid, ipc, etc.) using the
existing With helper in the oci package.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-16 15:23:04 -05:00
Michael Crosby
ea58933dbc
Merge pull request #2132 from tophj-ibm/lower-mkfs-size
[testing] use smaller filesize on 4KB pagesize systems
2018-02-16 11:42:11 -05:00
Kenfe-Mickaël Laventure
1392ad2b54
Merge pull request #2139 from estesp/godoc-typo
Clean up client Subscribe docs; remove a typo
2018-02-16 07:46:44 -08:00
Michael Crosby
849fed09e3
Merge pull request #2137 from tophj-ibm/bump-go-version
[contrib] bump golang
2018-02-16 10:29:34 -05:00
Christopher Jones
8043f26651
[contrib] bump golang
Use golang:1.9, which should get the latest 1.9.x version,
instead of using a specific tag.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-02-16 08:23:35 -05:00
Phil Estes
18be82118d
Clean up client Subscribe docs; remove a typo
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-15 20:38:57 -05:00
Christopher Jones
6e3701141b
[testing] use smaller filesize on 4KB pagesize systems
Use a smaller filesize on systems that have a default 4KB pagesize.

This is because mkfs.btrfs uses the default system pagesize as blocksize
when creating a device, so if the pagesize is larger, then the file needs
to be larger as well. This larger filesize is needed specifically for
systems where 64KB is default, such as ppc64le.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-02-15 15:33:46 -06:00
Michael Crosby
aa82d17d1d
Merge pull request #2079 from estesp/man-pages
Add initial man pages
2018-02-15 11:07:35 -05:00
Phil Estes
8f183b5ee9
Add basic manpages for ctr, containerd, containerd-config
Adds initial manpages for ctr, containerd, and containerd config
commands, as well as the config.toml configuration file.

Adds targets to Makefile for generating and installing manpages.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-14 15:17:31 -05:00
Michael Crosby
b2ec177bb2 Call temp mounts and unmount in containerd server
Fixes #2004

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-14 15:16:54 -05:00
Michael Crosby
bc974a7a32 Create temp mount location manager
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-14 15:14:02 -05:00
Phil Estes
002cabade8
Merge pull request #2131 from AkihiroSuda/split-pkg-cmd-containerd-2
cmd/containerd: split package for cli.App
2018-02-14 14:24:07 -05:00
Akihiro Suda
d7280ce2fb cmd/containerd: split package for cli.App
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-14 17:44:22 +09:00
Kenfe-Mickaël Laventure
af593cf5ab
Merge pull request #2130 from justincormack/environmnet
Fix typo in variable name
2018-02-13 07:23:22 -08:00
Justin Cormack
eab5d87af1 Fix typo in variable name
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-02-13 15:06:49 +00:00
Kenfe-Mickaël Laventure
dd920d99c8
Merge pull request #2125 from estesp/website-update
Carry #1951: Website update
2018-02-12 11:34:31 -08:00
Michael Crosby
efb813f18b
Merge pull request #2126 from dmcgowan/fix-2119
archive/diff: fix consecutive directory removal bug
2018-02-12 14:16:40 -05:00