Commit Graph

8778 Commits

Author SHA1 Message Date
Mike Brown
52ca2ebaab Merge pull request #10 from cmluciano/cml/addversionflag
Add version flag
2017-04-25 07:50:13 -05:00
Yanqiang Miao
bcc4d12706 Add an alias for ctr list
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-25 11:49:56 +08:00
Stephen Day
8f524ad42c Merge pull request #733 from kunalkushwaha/dist-cli-restructure
dist cli reorganized into sub-commands
2017-04-24 13:56:13 -05:00
Stephen Day
ce72a829c7 Merge pull request #752 from stevvooe/ctr-list-quiet
cmd/ctr: add quiet mode to `ctr list`
2017-04-24 13:46:58 -05:00
Christopher M. Luciano
683fd7f0e5
Add containerdVersion flag
Add version flag that only prints the static version for the binary.

This commit does not include build details for containers since
Makefile does not build them.

Closes #8

Signed-off-by: Christopher M. Luciano <cmluciano@us.ibm.com>
2017-04-24 14:46:16 -04:00
Stephen J Day
0377bfda5d
cmd/ctr: add quiet mode to ctr list
This is so I can delete all the containers I keep creating.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-24 12:19:47 -05:00
Christopher M. Luciano
d6978e3b7f
Add semver and testify packages to Godeps
Signed-off-by: Christopher M. Luciano <cmluciano@us.ibm.com>
2017-04-24 13:17:58 -04:00
Christopher M. Luciano
521a626bfb
Add Makefile task for tests
Signed-off-by: Christopher M. Luciano <cmluciano@us.ibm.com>
2017-04-24 13:17:37 -04:00
Kenfe-Mickaël Laventure
7a9cfbf20e Merge pull request #743 from krasi-georgiev/ctrl-c-handle-kill-container-processes
forward ctrl+c to stop container processes before exiting
2017-04-24 10:36:56 -05:00
Phil Estes
012cc9d48c Merge pull request #760 from kevinswiber/armv7_fix
Ensure proper types for arguments to `time.Unix`.
2017-04-22 11:48:10 -05:00
Phil Estes
445da51f2f Merge pull request #762 from dklyle/master
fix relative image paths
2017-04-22 11:47:28 -05:00
Lantao Liu
647e3274aa Merge pull request #17 from Random-Liu/add-build-golang-icons
Add travis build and golang report icons.
2017-04-21 18:42:08 -07:00
Random-Liu
ae23697431 Add travis build and golang report icons.
Signed-off-by: Random-Liu <lantaol@google.com>
2017-04-21 17:53:16 -07:00
Lantao Liu
0f5a7396aa Merge pull request #16 from Random-Liu/move-boilerplate-verification
Move boilerplate verification into hack
2017-04-21 17:40:02 -07:00
Random-Liu
ce85262144 Move boilerplate verification into hack
Signed-off-by: Random-Liu <lantaol@google.com>
2017-04-21 17:15:45 -07:00
Krasi Georgiev
e03485acda forward all signals to the container
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2017-04-22 01:46:57 +03:00
Mike Brown
ad93d9686f Merge pull request #14 from mikebrow/boilerplate-test
Boilerplate test
2017-04-21 17:38:01 -05:00
Mike Brown
8243c1feb7 removing unused repo-infra files; updating README.md
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-04-21 16:18:04 -05:00
Lantao Liu
f64592982e Merge pull request #12 from heartlock/enable-travis
enable travis CI
2017-04-21 13:46:21 -07:00
David Lyle
04f76c5505 fix relative image paths
Signed-off-by: David Lyle <david.lyle@intel.com>
2017-04-21 12:27:05 -06:00
Mike Brown
f9e02affcc adds boilerplate test to verify; cleanup boilerplate on a few files
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-04-21 12:44:25 -05:00
Mike Brown
07ad470bde Merge commit '031b284c8a15ad4b28f81b113a9f2018af5b1da6' as 'hack/repro-infra'
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-04-21 12:17:40 -05:00
Mike Brown
031b284c8a Squashed 'hack/repro-infra/' content from commit 684e550
git-subtree-dir: hack/repro-infra
git-subtree-split: 684e550a2f006dbe3cf3b3d481d3f19217b228f7
2017-04-21 11:39:29 -05:00
heartlock
8af8fd07d5 enable travis CI
Signed-off-by: heartlock <21521209@zju.edu.cn>
2017-04-20 22:26:27 -09:00
Qiang Huang
455a185d98 Merge pull request #740 from crosbymichael/oom-event
Emit oom events
2017-04-20 17:23:24 -05:00
Qiang Huang
a9601d1df9 Merge pull request #746 from sak0/dev
Correct the usage of containerd --config
2017-04-20 16:56:46 -05:00
Kevin Swiber
b365fbecfd Ensure proper types for arguments to time.Unix.
When compiling for armv7, the type is `int32` for `Timespec.Sec` and
`Timespec.Nsec` in the syscall package. When passing these values
to `time.Unix`, the values must be converted to `int64`.

Signed-off-by: Kevin Swiber <kswiber@gmail.com>
2017-04-20 12:55:06 -07:00
Michael Crosby
714ffdb51a Merge pull request #756 from lilyfang/patch-1
Update dockercon-summit.md
2017-04-20 11:07:12 -07:00
Li Li
6ae973362a Update dockercon-summit.md 2017-04-20 01:31:00 -05:00
Phil Estes
a12b20ebc4 Merge pull request #748 from miaoyq/del-tmpdir
Delete the temporary diractory at the end of the function "ApplyLayer"
2017-04-20 00:10:35 -05:00
Yanqiang Miao
df8ece5a41 Avoid creating snapshots repeatedly
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-20 12:59:33 +08:00
Stephen Day
3d076e5c33 Merge pull request #747 from miaoyq/rm-redundant-type-conversion
Remove the redundant type conversion
2017-04-19 15:19:24 -05:00
Derek McGowan
aee5b75cd8 Merge pull request #742 from xiekeyang/tmpdir
remove temporary dir
2017-04-19 13:26:50 -05:00
Derek McGowan
0f035c712f Merge pull request #750 from stevvooe/fix-dist-apply-help
cmd/dist: correct `dist apply` help
2017-04-19 13:24:28 -05:00
Stephen J Day
6eac7c159e
cmd/dist: correct dist apply help
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-19 12:57:28 -05:00
Phil Estes
ae502e8c2a Merge pull request #749 from boucher/patch-1
Checkpoint/Restore proposal
2017-04-19 10:06:18 -05:00
Ross Boucher
9999e85f80 Checkpoint/Restore proposal 2017-04-19 08:57:10 -05:00
Mike Brown
11ba1cb54d initial makefile (#7)
* adds initial makefile

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* clean up lint

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* presume path is set to contain gomealinter

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* addresses requested improvements

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-04-18 21:17:14 -05:00
Yanqiang Miao
c5c6f36e83 Delete the temporary diractory at the end of the function
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-19 09:52:44 +08:00
Yanqiang Miao
d95e98d049 Remove the redundant type conversion
The type of ocispec.Descriptor.Digest is digest.Digest now,
so the type conversion is redundant.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-18 16:55:19 +08:00
CuiHaozhi
d51976b60a Correct the usage of containerd --config
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
2017-04-17 06:44:18 -04:00
Kunal Kushwaha
18bcec512e dist subcommands reorganized.
few dist commands reorganized into subcommands "image" and "content".
Fix for #689

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-04-17 13:58:37 +09:00
Lantao Liu
b5734373c4 Merge pull request #2 from Random-Liu/add-initial-code
Add initial code
2017-04-14 19:05:05 -07:00
Random-Liu
022b25259e Update godep 2017-04-14 19:04:27 -07:00
Random-Liu
f2925f58ac Add initial code framework 2017-04-14 19:04:26 -07:00
Lantao Liu
2ec9bfc6ae Merge pull request #1 from Random-Liu/initial-document
Add initial documents.
2017-04-14 15:09:26 -07:00
Random-Liu
e51409a9cf Add initial documents. 2017-04-14 15:08:49 -07:00
Stephen Day
bbeaab5ee3 Merge pull request #739 from crosbymichael/exitedat
Add exited at to events and delete requests
2017-04-14 13:10:53 -07:00
Michael Crosby
5d3bc1a4a7 windows process exit timestamp
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-14 11:22:07 -07:00
Stephen Day
2369f498f2 Merge pull request #741 from xiekeyang/coverage
ignore coverage.out for git submit
2017-04-14 09:00:18 -07:00