docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
4,531 Commits 12 Branches 297 Tags
ad45902f8037ee4f3e8ba995fb6ea25277d51a3b
Commit Graph

322 Commits

Author SHA1 Message Date
Michael Crosby
cdb93a78ac Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
 2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
c17e4279fa Merge pull request #2773 from dotcloud/speed_up_docker_ps 
speedup docker ps
Upstream-commit: b4f7078a021489395bae4e43a33d457719d30ccc
Component: engine
 2013-11-20 10:40:03 -08:00
Michael Crosby
92e4e393e6 Add typo in remove all. Ensure tmpDir is removed 
Upstream-commit: 9de45904980dba224e8ab133f12cfc53835e2dd4
Component: engine
 2013-11-20 03:52:33 +00:00
Michael Crosby
3f60be4255 Fix error checks for offline transfer and remove unneeded debug output 
Upstream-commit: 0ef6fed5c7b7b1ab4084ecc99880ffc6a7c8eaca
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
5b716c3df7 Fixing build 
Upstream-commit: 844c13bce6429087e2763038136e6485da425741
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
623a7ac7d4 Setting offline package version to 1.0 
Upstream-commit: 6014db4a7e8d76580edf995bc974a55dace0c8ba
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
bac700fc36 Adding version info, switching to defer for cleanup 
Upstream-commit: 61a8020e51ac6de9bc777098a04e05a185c2cd32
Component: engine
 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
390195822f Offline Image Transfers #1155 
Upstream-commit: 7eaa59f626fa9e9b3bf61d3d7eff0fb70b3d011a
Component: engine
 2013-11-20 03:52:33 +00:00
Guillaume J. Charmes
b6950e3878 Merge branch 'master' into creack-merge-master 
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
 2013-11-19 14:58:12 -08:00
Victor Vieux
d8912e66aa speedup docker ps 
Upstream-commit: 145c2008ae3bbd8bca6e11bac93c6c0098a3ba42
Component: engine
 2013-11-19 11:02:10 -08:00
Guillaume J. Charmes
6e0c243c2e Lintify code with confidence=1 
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
 2013-11-18 16:24:11 -08:00
Victor Vieux
9af9f8999c Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup 
Fix tmp dir never cleanup
Upstream-commit: f946a486ea3cdb56c771a37da281ad223b5042f8
Component: engine
 2013-11-18 12:20:23 -08:00
Victor Vieux
10d4ab171f Fix tmp dir never cleanup 
Upstream-commit: 926169059374fb7a7a7035dde4e78f3418778a80
Component: engine
 2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
73e6c3f45e rename gograph in graphdb 
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
 2013-11-15 15:55:45 -08:00
Alexander Larsson
fa730d3073 Print devicemapper status details in docker info 
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.

The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
 2013-11-15 11:04:02 +01:00
Alexander Larsson
fb91dc2f0c Show active driver in docker info output 
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
 2013-11-15 10:24:48 +01:00
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
6c1679864e Move integration tests to integration/, expose missing public methods in the core 
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
 2013-11-14 10:50:00 -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
67a0c658d3 Pull parent layers first before children 
Upstream-commit: 7301fbe035ca450e2aea86b8f2467cffd3fac18b
Component: engine
 2013-11-12 11:48:35 -08:00
Victor Vieux
6ba500a617 Merge pull request #2614 from dotcloud/prevent_delete_image_running_container 
Runtime: prevent deletion if image is used by a running container
Upstream-commit: 637850063c7c218db83857e5fd01c3a472094a8d
Component: engine
 2013-11-12 11:01:51 -08:00
Victor Vieux
111d9154c1 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
 2013-11-12 10:19:29 -08:00
Victor Vieux
abd8707658 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
 2013-11-11 13:06:19 -08:00
Victor Vieux
fac387b017 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
 2013-11-11 12:34:16 -08:00
Mark Allen
29829cd5d2 Just return the id; nothing else. 
Upstream-commit: 62f873aa1f918fe4d303f6168f66d057e6776b18
Component: engine
 2013-11-11 13:26:24 -06:00
Mark Allen
9fcdb45469 Edits after code review 
Return long image ID
Return streamformatted error or "raw" error
Upstream-commit: 8cc19765b48d1a429b840b731ed5fd5b81fbda3c
Component: engine
 2013-11-10 00:06:55 -06:00
Sven Dowideit
d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098) 
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
 2013-11-09 12:16:49 +10:00
Victor Vieux
edd84b853d prevent deletion if image is used by a running container 
Upstream-commit: 45c2b5dc1a0d8f3658f012844f9d89fbb2290c42
Component: engine
 2013-11-08 15:01:01 -08:00
David Sissitka
5090a5bd4b Make "docker insert" errors obvious 
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
 2013-11-08 00:15:19 -06:00
Solomon Hykes
914824bce7 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
 2013-11-08 00:45:07 +00:00
Solomon Hykes
783f801512 gofmt 
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
 2013-11-07 23:58:03 +00:00
Solomon Hykes
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
 2013-11-07 23:26:52 +00:00
Solomon Hykes
7e3e167f73 Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface 
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
 2013-11-07 22:38:50 +00:00
Nate Jones
736f474973 bring back /images/viz, but 404 for latest 
Upstream-commit: 8f64759881b3d48e42927ed9bdf1c9162d3c8bb3
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones
cbbaa36a2b move "images -viz" to client 
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones
08d9fe490e fix "images -a" 
Upstream-commit: dcf0279a50e7a2eca97b205725df474a516b8f79
Component: engine
 2013-11-06 03:58:15 +00:00
Nate Jones
59c6d98498 rework images JSON 
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
 2013-11-06 03:58:15 +00:00
Solomon Hykes
e83abd1b63 Remove debug messages 
Upstream-commit: 8d6df3a7e2080d4fad9743beb159f12caa0ff6f7
Component: engine
 2013-11-05 23:00:20 +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
unclejack
9f8cb6e156 validate bind mounts on the server side 
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
   The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
   The source to be bind mounted must exist.

This fixes issue #2070.
Upstream-commit: 4d2ba779e1a0596c51cc6ed2ddb7c2139830f15c
Component: engine
 2013-11-05 22:54:24 +02:00
Solomon Hykes
5d5633048a Engine: optional environment variable 'Logging' in 'serveapi' 
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes
02af0b7684 Engine: fix a bug which caused handlers to be shared between multiple engine instances 
Upstream-commit: 847411a1ee6e5ee5d051fc4729425215dc0c8561
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes
6d10998928 httpapi: don't create a pidfile if it isn't set in the configuration 
Upstream-commit: 7b17d555992c65c6b10da21c8aa48062a1aba0d9
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes
26507356b3 Engine: 'start' starts the specified container 
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
 2013-11-05 18:39:59 +00:00
Solomon Hykes
8a182f4aaf Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs 
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
 2013-11-05 17:41:37 +00:00
Victor Vieux
956deb4fe0 Merge pull request #2502 from hamo/unlink_err_v4 
rewrite protocol check with switch-case in Server.Daemon
Upstream-commit: c5d4459a02ee98f629e65402551a871c451fb6ac
Component: engine
 2013-11-04 17:46:46 -08:00
Victor Vieux
22e1fc60ec Merge pull request #2382 from dotcloud/reflect_future_changes_search_api 
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
 2013-11-04 16:14:14 -08:00
Michael Crosby
626d3f3226 Ensure container name on register 
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
 2013-11-04 09:28:40 -08:00