Commit Graph

2903 Commits

Author SHA1 Message Date
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
Phil Estes
58835d2edc
Merge pull request #1697 from crosbymichael/template
Add template filepath for release tool
2017-10-30 13:43:25 -04:00
Michael Crosby
adc502b790 Add template filepath for release tool
This allows a project to have a TEMPLATE file in the root of the repo to
be used with the release tool.  If they don't have this file and did not
specify a custom file then it will use the compiled in template in the
release tool.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-30 13:15:56 -04:00
Phil Estes
5fb3a0e0cf
Merge pull request #1695 from runcom/abstract-release-tool
cmd: containerd-release: abstract it out to create a new project
2017-10-30 10:23:52 -04:00
Antonio Murdaca
fa678a0937
cmd: containerd-release: abstract it out to create a new project
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-10-30 15:10:41 +01:00
Michael Crosby
b93bd0cfec
Merge pull request #1676 from AkihiroSuda/null-io-fix
ctr: error if tty && nullIO
2017-10-30 10:10:22 -04:00
Akihiro Suda
e0da28acc4 ctr: error if tty && nullIO
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-10-29 23:58:57 +09:00
Michael Crosby
e74c423f78 Fix races with concurrent GC
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-27 14:47:23 -04:00
Phil Estes
1f704e9862 Merge pull request #1688 from crosbymichael/cli
Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
2017-10-26 23:11:31 +02:00
Michael Crosby
994c717d0d Merge pull request #1689 from jessvalarezo/ctr-refactor-third-pass
ctr: move signals, resolver utility functions to commands package
2017-10-26 16:46:15 -04:00
Jess Valarezo
16855eedf7 ctr: move resolver to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-26 16:31:58 -04:00
Jess Valarezo
ffd0d2ef58 ctr: move signals to commands package
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-26 16:31:23 -04:00
Michael Crosby
b8c4d85564 Add buildmode=pie to makefile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 16:25:30 -04:00
Michael Crosby
9d05197f96 Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 15:17:22 -04:00
Derek McGowan
638f3a3380 Merge pull request #1685 from jessvalarezo/ctr-refactor
ctr: move ctr commands
2017-10-26 11:36:18 -07:00
Jess Valarezo
8540587b37 ctr: move events command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 22:21:57 -04:00
Jess Valarezo
fdb6859921 ctr: move namespaces command
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-25 22:00:14 -04:00