microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
5 630 коммитов 243 Ветки 83 Теги 223 MiB
Граф коммитов

439 Коммитов

Автор SHA1 Сообщение Дата
Victor Vieux d5f5ecb658 improve GetenvJson 2013-12-13 16:02:19 -08:00
Victor Vieux 4b5ceb0f24 use args 2013-12-13 14:29:27 -08:00
Victor Vieux 930ec9f52c move commit to job 2013-12-13 14:19:56 -08:00
Guillaume J. Charmes aaa1c48d24 Merge pull request #3175 from vieux/engine-job-stop 
Move stop to job
 2013-12-13 14:15:58 -08:00
Victor Vieux 73e8a39ff2 move resize to job 2013-12-13 13:15:39 -08:00
Michael Crosby 8224e13bd2 Merge pull request #3185 from vieux/job_tag 
Move tag to job
 2013-12-12 17:02:39 -08:00
Victor Vieux e43ff2f6f2 move tag to job 2013-12-12 11:52:11 -08:00
Victor Vieux 1124261158 Merge pull request #3144 from codeaholics/643-stale-nfs-handle 
Prevent deletion of image if ANY container is depending on it; not just running containers
 2013-12-11 17:18:54 -08:00
Victor Vieux 6ba456ff87 move t from arg to env 2013-12-11 15:36:50 -08:00
Solomon Hykes dbe1915fee Engine: new command 'stop' gracefully stops a container. 2013-12-11 11:52:59 -08:00
Michael Crosby bd292759f0 Merge pull request #3153 from vieux/improve_docker_push_display 
Update docker push to use new display
 2013-12-11 11:11:53 -08:00
Michael Crosby 5fd3c8204d Merge pull request #2735 from shykes/engine-job-kill 
New engine command: 'kill'
 2013-12-11 10:35:57 -08:00
Victor Vieux 0025e9bd71 Merge pull request #3113 from shykes/engine-export 
Move 'docker export' to the engine API
 2013-12-10 13:28:24 -08:00
Victor Vieux 95f061b408 update docker push to use [====> ] 2013-12-10 10:57:16 -08:00
Victor Vieux 09d2c2351c Merge pull request #3119 from shykes/engine-version 
Port 'docker version' to the engine API
 2013-12-09 17:35:44 -08:00
Danny Yates 776bb43c9e Prevent deletion of image if ANY container is depending on it; not just running containers 2013-12-09 20:46:21 +00:00
Solomon Hykes de35b346d1 Port 'docker version' to the engine API 2013-12-08 07:41:53 +00:00
Solomon Hykes 869a11bc93 Cleanup version introspection 
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
 2013-12-08 07:35:24 +00:00
Solomon Hykes 9656cdf0c2 Engine: 'export' returns a raw archive of a container's filesystem 2013-12-08 01:33:37 +00:00
Solomon Hykes 3569d080af New engine command: 'wait' 2013-12-06 23:05:21 +00:00
Solomon Hykes 427bdb60e7 Engine: port 'kill' to the new integer status. 2013-12-06 23:02:27 +00:00
Solomon Hykes 9b1930c5a0 gofmt 2013-12-06 23:02:27 +00:00
Solomon Hykes fdb3de7b11 Engine: new command 'kill' sends a signal to a running container 2013-12-06 23:02:27 +00:00
Victor Vieux fb810b54ff wait on pull from another client 2013-12-05 14:41:56 -08:00
Victor Vieux a8e99d9235 Merge pull request #2917 from codeaholics/2698-only-tag-top-layer 
Only tag the top-most layer when pushing to a registry
 2013-12-05 10:02:57 -08:00
Victor Vieux 5f55c1aee1 Merge pull request #2966 from andrewsmedina/govet2 
fixed some `go vet` issues.
 2013-12-04 17:57:10 -08:00
Victor Vieux be282b57d5 fix offline image transfert 2013-12-04 11:55:42 -08:00
Victor Vieux 12180948be remove unused parameter in Download 2013-12-04 11:54:11 -08:00
shin- 045989e3d8 Use basic auth for private registries when over HTTPS. 
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
 2013-12-03 16:32:13 +01:00
Victor Vieux 67c03552f6 Merge pull request #2957 from creack/handle_sigquit 
Catch SIGQUIT for cleanup
 2013-12-02 12:13:07 -08:00
Michael Crosby e1414a4c39 Merge pull request #2945 from dotcloud/refactor_stream 
Refactor stream
 2013-12-02 10:31:09 -08:00
Guillaume J. Charmes 4e030c78d2
Merge branch 'master' into handle_sigquit 
Conflicts:
	server.go
 2013-11-29 18:51:32 -08:00
Andrews Medina a6c9a332d0 fixed some `go vet` issues. 2013-11-29 22:53:20 -02:00
Solomon Hykes a4f8a2494b Engine: integer job status, improved stream API 
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
 2013-11-30 00:25:46 +00:00
Guillaume J. Charmes db7c55ba7f
Catch SIGQUIT for cleanup 2013-11-29 14:13:00 -08:00
Guillaume J. Charmes 0d3f4017cf Merge pull request #2929 from pnasrat/2928-fix-signal-handling 
Remove incorrect SIGKILL handler.
 2013-11-29 14:10:46 -08:00
Victor Vieux cca9e51f5d Merge pull request #2941 from codeaholics/2940-invalid-registry-calls 
Stop invalid calls to Registry
 2013-11-28 17:00:22 -08:00
Victor Vieux 597e0e69b4 split in 3 files 2013-11-28 12:16:57 -08:00
Victor Vieux 377817db1b Merge pull request #2913 from pnasrat/2852-deleteimage-performance 
Performance of deleteImageAndChildren.
 2013-11-28 11:20:43 -08:00
Danny Yates d47507791e Stop invalid calls to Registry 
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
 2013-11-28 16:43:28 +00:00
Paul Nasrat bdfe8ed403 Remove incorrect SIGKILL handler. 
As per POSIX signal handling SIGKILL does not work.

Fixes #2928
 2013-11-28 10:42:06 -05:00
Danny Yates d1a631cedb Only tag the top-most layer, not all interim layers 2013-11-27 22:00:58 +00:00
Paul Nasrat 4e826e99b2 Performance of deleteImageAndChildren. 
Don't walk the file system for parents each time we recurse.

Fixes #2852
 2013-11-27 12:55:15 -05:00
Danny Yates 788feab3a7 Handle the case where poolAdd() gives an error for an unknown pool type 2013-11-27 16:53:36 +00:00
Danny Yates ae474e05f5 Allow multiple clients to pull the same tag simultaneously 
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
 2013-11-27 12:18:01 +00:00
Guillaume J. Charmes 19df6c32c0
Merge branch 'master' into use_utc_time 
Conflicts:
	image.go
 2013-11-25 19:01:13 -08:00
Solomon Hykes 1d903da6fd Merge pull request #2609 from shykes/0.6.5-dm-plugin 
Move aufs to a storage driver, add devicemapper and dummy drivers
 2013-11-25 18:58:26 -08:00
Paul Nasrat abfdaca3f8 Fix data race in TestLogEvent 
Found with -race. Improve locking on Server.
 2013-11-25 14:17:58 -05:00
Michael Crosby e69bbd239e Merge branch 'master' into 0.6.5-dm-plugin 2013-11-22 14:06:59 -08:00
Michael Crosby d4c8fb9ee2 Merge pull request #2769 from vbatts/none_bridge 
Do not setup bridge ip if 'none' bridge is provided
 2013-11-22 11:48:33 -08:00
Michael Crosby 0cecc2a78c Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	image.go
 2013-11-21 17:18:41 -08:00
Guillaume J. Charmes 806abe90ba Use UTC for time 2013-11-21 16:43:36 -08:00
Michael Crosby 25e443a3c7 Merge pull request #2798 from dotcloud/fix_state_race 
Refactor State to be 100% thread safe
 2013-11-21 16:39:50 -08:00
Guillaume J. Charmes 33e70864a2
Refactor State to be 100% thread safe 2013-11-21 16:34:58 -08:00
Michael Crosby d6e6214d37 Merge pull request #2678 from cxmcc/minor 
Minor code simplification for Containers api
 2013-11-21 16:27:15 -08:00
Michael Crosby 70f1bd3104 Merge pull request #2488 from viirya/fix_container_volumes_delete 
Skip the volumes mounted when deleting the volumes of container.
 2013-11-21 16:20:22 -08:00
Guillaume J. Charmes 42c23b0f04 Merge pull request #2763 from dotcloud/use_full_id_delete 
Do ont truncate ID on docker rmi
 2013-11-21 14:39:38 -08:00
Paul Morie 3f17844b6e Fix typo in pullImage 2013-11-21 17:29:03 -05:00
Michael Crosby 253214f07d Update ImageExport after merge fail 2013-11-21 10:26:21 -08:00
Michael Crosby a2c9d2da93 Merge branch 'master' into 0.6.5-dm-plugin 2013-11-21 10:21:30 -08:00
Michael Crosby fd7ab143bf Allow images to be saved and loaded by id and repository 2013-11-20 17:28:19 -08:00
Victor Vieux 8a756f417e wait on pull already in progress 2013-11-20 14:04:19 -08:00
Michael Crosby 2382a0f920 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
 2013-11-20 11:07:42 -08:00
Guillaume J. Charmes b4f7078a02 Merge pull request #2773 from dotcloud/speed_up_docker_ps 
speedup docker ps
 2013-11-20 10:40:03 -08:00
Vincent Batts 60cb5f1a34 do not setup bridge ip if bridgeNetwork is nil. This is the case when 
-b='none' bridge is provided.

issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
 2013-11-20 09:36:38 -05:00
Michael Crosby 9de4590498 Add typo in remove all. Ensure tmpDir is removed 2013-11-20 03:52:33 +00:00
Michael Crosby 0ef6fed5c7 Fix error checks for offline transfer and remove unneeded debug output 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV 844c13bce6 Fixing build 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV 6014db4a7e Setting offline package version to 1.0 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV 61a8020e51 Adding version info, switching to defer for cleanup 2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV 7eaa59f626 Offline Image Transfers #1155 2013-11-20 03:52:33 +00:00
Guillaume J. Charmes 28d4cbbc59
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
 2013-11-19 14:58:12 -08:00
Victor Vieux 145c2008ae speedup docker ps 2013-11-19 11:02:10 -08:00
Victor Vieux 2fe4467d73 Do ont truncate ID on docker rmi 2013-11-18 18:39:02 -08:00
Guillaume J. Charmes 5e941f1ca0
Lintify code with confidence=1 2013-11-18 16:24:11 -08:00
Victor Vieux f946a486ea Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup 
Fix tmp dir never cleanup
 2013-11-18 12:20:23 -08:00
Victor Vieux 9261690593 Fix tmp dir never cleanup 2013-11-15 16:23:55 -08:00
Guillaume J. Charmes cbd1281ec9
rename gograph in graphdb 2013-11-15 15:55:45 -08:00
Alexander Larsson 243843c078 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.
 2013-11-15 11:04:02 +01:00
Alexander Larsson 062810caed Show active driver in docker info output 2013-11-15 10:24:48 +01:00
Guillaume J. Charmes 7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
 2013-11-14 14:02:44 -08:00
Solomon Hykes 359a6f49b9 Move integration tests to integration/, expose missing public methods in the core 2013-11-14 10:50:00 -08:00
Solomon Hykes b00d5f0185 gofmt 2013-11-13 19:25:55 +00:00
Xiuming Chen 0013aa7d9f Minor code simplification for Containers api 2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh 1d7f22c0d4 use Binds key in hostConfig to detect volumes mounted from external. 2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh 6a693176d6 skip the volumes mounted when deleting the volumes of container. 2013-11-13 14:58:24 +08:00
Solomon Hykes 6c4393ccbb Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
 2013-11-13 00:36:20 +00:00
Michael Crosby 7301fbe035 Pull parent layers first before children 2013-11-12 11:48:35 -08:00
Victor Vieux 637850063c Merge pull request #2614 from dotcloud/prevent_delete_image_running_container 
Runtime: prevent deletion if image is used by a running container
 2013-11-12 11:01:51 -08:00
Victor Vieux b314f19db8 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
 2013-11-12 10:19:29 -08:00
Victor Vieux 87c8437a90 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
 2013-11-11 13:06:19 -08:00
Victor Vieux da24945070 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 2013-11-11 12:34:16 -08:00
Mark Allen 62f873aa1f Just return the id; nothing else. 2013-11-11 13:26:24 -06:00
Mark Allen 8cc19765b4 Edits after code review 
Return long image ID
Return streamformatted error or "raw" error
 2013-11-10 00:06:55 -06:00
Sven Dowideit b3974abe4f make all image ID and container ID API responses use the Long ID (Closes #2098) 2013-11-09 12:16:49 +10:00
Victor Vieux 45c2b5dc1a prevent deletion if image is used by a running container 2013-11-08 15:01:01 -08:00
David Sissitka 5957dd9091 Make "docker insert" errors obvious 
Closes #1130
See also #1942
 2013-11-08 00:15:19 -06:00
Solomon Hykes 9ae4bcaaf8 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
 2013-11-08 00:45:07 +00:00
Solomon Hykes f1127b9308 gofmt 2013-11-07 23:58:03 +00:00
Solomon Hykes 165d1bdbc0 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
 2013-11-07 23:26:52 +00:00