docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
4,365 Commits 12 Branches 297 Tags
e63f1ff2a2968bbe6f873edd45282eb709c168ce
Commit Graph

128 Commits

Author SHA1 Message Date
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Solomon Hykes
cea9cd6554 gofmt 
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
 2013-11-13 19:25:55 +00:00
Solomon Hykes
a48718c85a Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
 2013-11-13 00:36:20 +00:00
Michael Crosby
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface 
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
 2013-11-11 19:09:57 -08:00
Solomon Hykes
675c173a12 Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories 
Upstream-commit: ec6fe9f2007a0400a441b79c89bced5727589ba9
Component: engine
 2013-11-11 18:56:21 +00:00
Guillaume J. Charmes
504a744b38 Fix formatting in tests 
Upstream-commit: 402a58a75a5b9813c889bf6c030bb756f86e56d4
Component: engine
 2013-11-11 09:05:38 -08:00
Nate Jones
7820a4a479 adding test for "images -viz" 
Upstream-commit: d9fe0647cb464ccd6f79ac33fb1d1ac56441f6b0
Component: engine
 2013-11-06 04:04:24 +00:00
Solomon Hykes
e6df3df72c Engine: 'create' creates a container and prints its ID on stdout 
Upstream-commit: e5f8ab6160401fb541121da5b5cbc3af4fce28b7
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes
c3fb3fd512 Better error reporting in engine logs and unit tests 
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
 2013-11-05 23:00:20 +00:00
Solomon Hykes
c136168290 Hack: simplify the creation of test directories 
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
 2013-11-05 23:00:16 +00:00
Michael Crosby
626d3f3226 Ensure container name on register 
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
 2013-11-04 09:28:40 -08:00
Jérôme Petazzoni
5e4f415366 Refactor HostConfig and escape apparmor confinement 
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
 2013-11-01 13:55:19 -07:00
Victor Vieux
04226c60be Merge pull request #2494 from shykes/engine-links 
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
 2013-10-31 16:32:49 -07:00
Victor Vieux
d6b078e758 fix typos 
Upstream-commit: 1c7ca51f3246baca6be75705ed932d26e20589e2
Component: engine
 2013-10-30 13:18:48 -07:00
Victor Vieux
d2b1922a6b continue build on expose with :, but displays a warning 
Upstream-commit: b2503a72f1f1db887fd11199036f05efe3d35992
Component: engine
 2013-10-30 11:13:10 -07:00
Victor Vieux
81ae14e1e4 remove some logs from tests 
Upstream-commit: 86970d00bbb9c5e3184fe4e3e7442fd0865c80ec
Component: engine
 2013-10-29 14:42:34 -07:00
Michael Crosby
7ce1e20657 Add -name for docker run 
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
 2013-10-28 18:09:08 -07:00
Solomon Hykes
b6319ac31a Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge 
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
 2013-10-26 14:24:13 -07:00
Michael Crosby
c25b5fa785 Ensure child containers are started before parents 
Upstream-commit: 356af1540f9a43337571e0f3ad6038789b38478e
Component: engine
 2013-10-25 15:13:26 -07:00
Michael Crosby
3f2eaa1c43 Use persistent connection for links database 
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Upstream-commit: 7c08aeeba4ab94f77e221bfc01741cce0866d224
Component: engine
 2013-10-25 15:13:25 -07:00
Tianon Gravi
7f47a302d5 Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary 
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
 2013-10-25 15:13:25 -07:00
Victor Vieux
22100af3d2 fix tests 
Upstream-commit: dbe7d67c183d2fcea2748dd09751c79bc9810b88
Component: engine
 2013-10-25 15:13:25 -07:00
Victor Vieux
5b0bbe7633 remove docker ls and add docker link in usage and switch to go1.2rc2 
Upstream-commit: 6c863b49ef9de8f203c84f7e2e55f33deeb10bdb
Component: engine
 2013-10-25 15:13:25 -07:00
Victor Vieux
1ea9ba1de7 fix merge issue and gofmt 
Upstream-commit: 89fb51f6063467124c8883399fc293faae8d8ef5
Component: engine
 2013-10-25 15:13:25 -07:00
Alexander Larsson
69a28976c0 Move SysInit to a submodule 
This allows docker-init to not import the main docker
module, which means it won't e.g. pick up any sqlite
dependencies.
Upstream-commit: db999667245926569b161747eed7e08b2ec1c34c
Component: engine
 2013-10-25 15:13:24 -07:00
Michael Crosby
952ac8a789 Add links for container relationships and introspection 
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
 2013-10-25 15:13:24 -07:00
Victor Vieux
264d4e8059 remove log 
Upstream-commit: acc2aec988450b117c183f35a4e743b882a55113
Component: engine
 2013-10-24 15:13:47 -07:00
Guillaume J. Charmes
fbbaaa37c7 Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start 
Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68
Component: engine
 2013-10-18 16:26:16 -07:00
Solomon Hykes
06ac81c4b1 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests 
Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3
Component: engine
 2013-10-18 02:13:36 +00:00
Victor Vieux
c27a5b0233 add cleanupin tests to remove leftover containers 
Upstream-commit: f854529ae8c9e0139e9ca0466c597b133e3bf41e
Component: engine
 2013-10-16 18:06:37 +00:00
Michael Crosby
bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix 
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
 2013-10-15 17:40:48 -07:00
Michael Crosby
4d7c2bfb0d Merge pull request #2133 from dotcloud/improve_tests 
Make sure to close the network allocators
Upstream-commit: ded74b0bb37d328a8c1a69f1f9b9aca2bba58199
Component: engine
 2013-10-09 15:45:16 -07:00
Victor Vieux
177e714a8f replace panic by log.Fatal in tests 
Upstream-commit: 823174de4d1acb93613c1b5ba53873906f43f62c
Component: engine
 2013-10-09 13:47:49 +00:00
Guillaume J. Charmes
921ffe0649 Make sure to close the network allocators 
Upstream-commit: 9107565d0634ea3eed3290c6c4b6c0f006fdefe8
Component: engine
 2013-10-08 15:42:02 -07:00
Victor Vieux
34abbb9020 Add test 
Upstream-commit: 1328be7c299417aa8c8740ac4901a978724afa9b
Component: engine
 2013-10-03 15:21:14 +00:00
Michael Crosby
0d8ea16762 Merge pull request #1759 from bdon/graph-map 
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
 2013-09-10 08:49:11 -07:00
Solomon Hykes
aa0ad01db6 Merge builder.go into runtime.go 
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
 2013-09-06 17:33:05 -07:00
Brandon Liu
c7e2ec175d Replace Graph.All with Graph.Map 
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
 2013-08-31 20:44:42 -07:00
Victor Vieux
6b54138e54 use init function 
Upstream-commit: 740a97f1a836be17ab39e8496b7372900782c20b
Component: engine
 2013-08-29 22:55:29 +00:00
shin-
b2a84c3f0c Fixed: ImagePull in runtime test 
Upstream-commit: 1c6af604e824d8fa2896c4906f05a0a3729c8e52
Component: engine
 2013-08-23 04:32:09 +02:00
Guillaume J. Charmes
00a7cbd80b Merge pull request #1290 from dotcloud/parallel_pull 
* Runtime: Parallel pull
Upstream-commit: e54e8fa9205409e741a64c7d7746e2e548c52fc0
Component: engine
 2013-08-05 14:17:29 -07:00
Guillaume J. Charmes
0c11df3e01 Merge pull request #1267 from sridatta/new-clean-init 
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
 2013-08-05 13:23:22 -07:00
Victor Vieux
d2c440fbc7 add parallel pull to 1.4 
Upstream-commit: 46f59dd9333baa578b184eb25b386ac2f41caf04
Component: engine
 2013-07-30 12:15:33 +00:00
Guillaume J. Charmes
4350e3145d Fixes #505 - Make sure all output is send on the network before closing 
Upstream-commit: fd9ad1a19469d07944ca9b417861d63ecec2ef42
Component: engine
 2013-07-24 15:48:51 -07:00
Victor Vieux
f64e80d22b update AUTHORS 
Upstream-commit: 7aba68cd548d69e10e710029ca143b32fd291585
Component: engine
 2013-07-23 19:55:38 +00:00
Solomon Hykes
7c7e6abf06 + Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container. 
Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2
Component: engine
 2013-07-17 17:13:34 -07:00
Solomon Hykes
1aa0235482 Hack: use helper functions in tests for less copy-pasting 
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
 2013-07-12 17:56:55 -07:00
Solomon Hykes
6c9e32ae32 Simplify unit tests code with mkRuntime() 
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
 2013-07-11 17:59:25 -07:00
Louis Opter
cafbcadc85 Make the TestAllocate{UDP,TCP}PortLocalhost more reliable 
- For the TCP test try again if socat wasn't listening yet;
- For the UDP test raise the timeout to a minute to workaround what
  seems to be an issue with Linux.
Upstream-commit: 5a411fa38e49e5d79602f01fa9aaf058c12e5627
Component: engine
 2013-07-10 18:25:53 -07:00
Louis Opter
26ac911253 Raise the timeouts for the TCP/UDP localhost proxy tests 
Sometimes these tests fail, let's see if that improves the situation.
Upstream-commit: 8f36467107d623e94638e2dd4c625e34f670384d
Component: engine
 2013-07-10 16:05:14 -07:00