Commit Graph

3069 Commits

Author SHA1 Message Date
Michael Crosby
fc08f019f3 Fix windows compile for dialer package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:56:02 -05:00
Michael Crosby
bba473aeb1 Move shim client into subpackage
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
13c7c3ef10 Remove urfave cli dep from shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
a70b95b202 Move events exchange into subpackage
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
526d15bd86 Move dial funcs to dialer pkg
This reduces shim size from 30mb to 18mb

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-07 10:51:12 -05:00
Michael Crosby
01cdf330bb
Merge pull request #1716 from crosbymichael/strip
Strip binaries in Makefile
2017-11-07 10:44:47 -05:00
Michael Crosby
2aad5ecdf6
Merge pull request #1725 from dmcgowan/diff-parent-permission
fs: add directory permission tests
2017-11-07 09:34:13 -05:00
Derek McGowan
8889d459af
Add directory permission tests
Adds tests for verifying parent directory permissions.
Currently an issue exists in extracting into some Docker graph
drivers. Supporting these graph drivers may require changes to
the diff logic, these tests clarify the existing behavior and
that extraction within containerd works.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-06 13:50:04 -08:00
Daniel, Dao Quang Minh
7e398dd591
Merge pull request #1717 from dnephin/use-gometalinter
Use gometalinter for linting
2017-11-06 16:11:46 +00:00
Michael Crosby
46ac2befcc
Merge pull request #1721 from bandoshintaro/master
Fix docs, log output in getting started
2017-11-06 10:35:48 -05:00
Phil Estes
8498de00bd
Merge pull request #1719 from AkihiroSuda/proc-scsi
Add /proc/scsi to masked paths
2017-11-06 09:44:16 -05:00
bando-shintaro
5128f034b8 Fix docs, log output in getting started
Signed-off-by: bando-shintaro <bando142141@gmail.com>
2017-11-05 23:25:27 +09:00
Akihiro Suda
db589884ee Add /proc/scsi to masked paths
Port over https://github.com/moby/moby/pull/35399

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-04 17:34:28 +00:00
Daniel Nephin
f9e969bac8 Use gometalinter for linting
gometalinter runs linters in parallel for faster linting
it provides a uniform way of whitelisting lines using // nolint or the exclude
field in the config

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-03 18:02:27 -04:00
Kenfe-Mickaël Laventure
ab67fd50dc
Merge pull request #1715 from thaJeztah/nit-fix-printf
Align version output and minor code cleanup
2017-11-03 10:08:57 -07:00
Sebastiaan van Stijn
65d5b8b937
Align version output and minor code cleanup
This patch changes the output of `ctr version` to align version and revision.
It also changes `.Printf()` to `.Println()`, to make the code slightly easier
to read.

Before this change:

    $ ctr version
    Client:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

With this patch applied:

    $ ctr version
    Client:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-03 17:49:23 +01:00
Michael Crosby
a045575998 Strip binaries in Makefile
This will make the binaries around 8MB smaller.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-03 11:44:41 -04:00
Stephen Day
99595e0b84
Merge pull request #1714 from dnephin/remove-deadcode-from-release
Remove deadcode from cmd/containerd-release
2017-11-02 16:57:16 -07:00
Daniel Nephin
393e8cc332 Remove deadcode from cmd/containerd-release
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-02 17:45:41 -04:00
Derek McGowan
5acf187697
Merge pull request #1712 from stevvooe/defaults-package
defaults: add package to contain server defaults
2017-11-02 14:11:02 -07:00
Stephen J Day
0a1a13448b
defaults: add package to contain server defaults
To reduce the binary size of containerd, we no longer import the
`server` package for only a few defaults. This reduces the size of `ctr`
by 2MB. There are probably other gains elsewhere.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-02 13:59:34 -07:00
Michael Crosby
564600ee79
Merge pull request #1707 from dmcgowan/snapshot-storage-db
Open snapshot database only once
2017-11-02 13:45:36 -04:00
Derek McGowan
68d3c77eae
Open snapshot database only once
Prevents having multiple database connections open to a connection,
preventing bugs with locking by relying on the boltdb database
object to handle synchronization rather than file locking.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-02 10:32:13 -07:00
Kenfe-Mickaël Laventure
7a91c66d25
Merge pull request #1710 from AkihiroSuda/print-revision
containerd --version: print version.Revision
2017-11-02 07:56:41 -07:00
Akihiro Suda
dfdcd4decb containerd --version: print version.Revision
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-02 07:56:17 +00:00
Stephen Day
c933088381
Merge pull request #1663 from dmcgowan/content-local-labels
content: add support for label storage in local content store
2017-11-01 11:24:15 -07:00
Stephen Day
a7a869f14e
Merge pull request #1703 from estesp/remove-copyright
Update LICENSE.docs with proper CC-BY-4.0 text
2017-11-01 10:49:13 -07:00
Phil Estes
aa3516487c
Merge pull request #1704 from jessvalarezo/ctr-move-tasks
ctr: move commands (tasks, run, pprof, shim)
2017-11-01 12:57:07 -04:00
Derek McGowan
7b08bcdb65
Add support for label storage in local content store
Allows running tests which require labels on the content store

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-31 12:59:52 -07:00
Jess Valarezo
864b16a2cb ctr: alphabetize commands, rename signals
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
f654b7b71e ctr: move pprof to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
a827a17f1d ctr: move shim to commands
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:49 -07:00
Jess Valarezo
c3b70f1d0b ctr: move tasks, run to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-31 11:57:41 -07:00
Phil Estes
7d6017a954
Update LICENSE.docs with proper CC-BY-4.0 text
Follow-on to #1702 to correct the actual license text of the CC-BY-4.0
license. Also clean up Licenses section of README.md and link to
LICENSE.code file. Remove unecessary copyright and "rights reserved"
statement.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-10-31 11:46:59 -04:00
Kenfe-Mickaël Laventure
fe3d9a70fa
Merge pull request #1702 from estesp/fix-cc-by-lic
Fix CC-BY license reference in README.md
2017-11-01 01:47:11 +11:00
Phil Estes
474d4df2aa
Merge pull request #1692 from dmcgowan/gc-fix-sweep-race
Fix race in gc sweep
2017-10-31 10:28:33 -04:00
Phil Estes
ff904841f9
Merge pull request #1668 from jessvalarezo/image-unpack-check
client: Add helper function which checks if an image is unpacked
2017-10-31 10:23:08 -04:00
Phil Estes
015788f1d8
Fix CC-BY license reference in README.md
Fix the reference to the shortname of the correct license already being
linked to in the README.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-10-31 10:19:16 -04:00
Akihiro Suda
7fd20edf4e
Merge pull request #1701 from stevvooe/backoff-v1-images
remotes/docker/schema1: back off on locked ref
2017-10-31 15:04:46 +09:00
Phil Estes
9f5b97c510
Merge pull request #1698 from crosbymichael/task-ls
Move task list to separate command
2017-10-30 21:30:02 -04:00
Phil Estes
8bbf8d892a
Merge pull request #1693 from jessvalarezo/ctr-refactor-fourth-pass
ctr: move more commands
2017-10-30 21:29:24 -04:00
Jess Valarezo
1552ee23da client: Add helper function which checks if an image is unpacked
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 16:33:54 -07:00
Stephen J Day
8eee47cf82
remotes/docker/schema1: back off on locked ref
To allow concurrent pull of images of the v1 persuasion, we need to
backoff when multiple pullers are trying to operate on the same
resource. The back off logic is ported to v1 pull to match the behavior
for other images.

A little randomness is also added to the backoff to prevent thundering
herd and to reduce expected recovery time.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-10-30 15:40:54 -07:00
Jess Valarezo
7a1d709cc9 ctr: remove apply command
* in its current state, apply command should not be in ctr

Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 14:46:44 -07:00
Derek McGowan
432670237c
Fix race in gc sweep
Removes extra goroutine and calls removal and scan in same thread

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-30 13:56:16 -07:00
Jess Valarezo
e4da49c44c ctr: move unpack to snapshot command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:36 -07:00
Jess Valarezo
456d3f4475 ctr: move push and pull to images command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:36 -07:00
Jess Valarezo
b58e4fc2ed ctr: move fetch,fetch-object,push-object to content
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-30 13:23:06 -07:00
Stephen Day
e2f9fbfe71
Merge pull request #1687 from crosbymichael/pie
Add buildmode=pie to makefile
2017-10-30 12:02:34 -07:00
Michael Crosby
91597bc6c3 Move task list to separate command
This keeps the semantics the same as the other commands to only list
containers, tasks, images by calling the list subcommand.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-30 15:01:00 -04:00