docker
/
engine-api
зеркало из https://github.com/docker/engine-api.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
9 126 коммитов 4 Ветки 13 Теги 3,8 MiB
Граф коммитов

9126 Коммитов

Автор SHA1 Сообщение Дата
Guillaume J. Charmes b7b931da66 Merge pull request #95 from dotcloud/93-test_restore_fail-fix 
Make sure that Deregister really returns an error instead of just displaying it
 2013-03-15 03:10:27 -07:00
Ken Cochrane 2d91fb4038 merge from master 2013-03-14 18:23:45 -07:00
Solomon Hykes 08353d7359 Merge remote-tracking branch 'origin/65-autodownload_unittest_image' 2013-03-14 12:07:46 -07:00
Guillaume J. Charmes 3ffdc8f59e Merge pull request #78 from dotcloud/77-undeleted_mountpoint-fix 
Fix undeleted mountpoint on destroy
 2013-03-14 10:09:00 -07:00
Solomon Hykes eee4bf3aa1 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-03-13 21:50:25 -07:00
Solomon Hykes 57f966f75a Merge pull request #74 from jpetazzo/contrib-install-sh 
Update get.docker.io install script for single-binary
 2013-03-13 21:30:45 -07:00
Solomon Hykes 2ca6776b83 Merge pull request #73 from jpetazzo/contrib-make-busybox-image 
Add contrib/ directory, README, and script to create a basic busybox image
 2013-03-13 21:30:22 -07:00
Solomon Hykes 1844a6bcda Merge pull request #72 from chooper/master 
Create /var/lib/docker so new installs don't fail
 2013-03-13 19:51:12 -07:00
Charles Hooper e4e6ebf22e Merge remote-tracking branch 'upstream/master' 2013-03-14 01:49:46 +00:00
Solomon Hykes 0f11763a5b Merge pull request #61 from synack/master 
Add a makefile to make life easier
 2013-03-13 15:44:22 -07:00
Solomon Hykes 0781f44aed Merge branch store_register_refactor 2013-03-13 14:09:04 -07:00
Solomon Hykes 1ade6089b3 Merge branch 'pull-missing' of ssh://github.com/chooper/docker 2013-03-13 13:50:47 -07:00
Solomon Hykes 94bbd81c14 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-03-13 13:24:16 -07:00
Guillaume J. Charmes d577d9ca1a Merge pull request #64 from dotcloud/32-aufs_delete_fix 
32 aufs delete fix
 2013-03-13 13:04:55 -07:00
Charles Hooper 8d211d084e Merge branch 'master' into pull-missing 2013-03-13 19:51:08 +00:00
Solomon Hykes cd87123250 Merged branch 28-standalone 2013-03-13 12:23:37 -07:00
Charles Hooper 1349b2f6f6 Merge branch 'master' into pull-missing 
Conflicts:
	image/image.go
	server/server.go
 2013-03-13 18:33:48 +00:00
Solomon Hykes 88e905dd7f Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-03-13 11:27:23 -07:00
creack 9373822268 Merge branch 'master' into 32-aufs_delete_fix 2013-03-13 01:18:55 -07:00
Solomon Hykes 4fad70eda5 Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon 2013-03-13 00:29:40 -07:00
Solomon Hykes d22962166f Merged master 2013-03-12 21:53:34 -07:00
Solomon Hykes c10f34e076 Merged version option by @kencochrane 2013-03-12 20:59:47 -07:00
Solomon Hykes cee559593d Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth 2013-03-12 15:05:41 -07:00
Solomon Hykes 210802fe69 Merge pull request #58 from lopter/master 
Automatically remove the rcfile generated by docker -i from /tmp
 2013-03-12 12:15:34 -07:00
Louis Opter 742487f460 Automatically remove the rcfile generated by docker -i from /tmp 2013-03-12 12:12:40 -07:00
Solomon Hykes 0287ae7fc5 Merge pull request #57 from kencochrane/vagrant-fix 
upgraded kernel to 3.5.0-25 to fix a kernel bug
 2013-03-12 12:10:17 -07:00
Solomon Hykes 454838bd6e Merge pull request #48 from dotcloud/memorylimits 
Memorylimits
 2013-03-12 12:02:49 -07:00
creack f97c6b86ba Put back the github.com path for the import 2013-03-12 11:59:27 -07:00
Solomon Hykes fa302d2f56 Merge remote-tracking branch 'remotes/chooper/help-ux' 2013-03-12 11:11:33 -07:00
Solomon Hykes 4c3067c31e Merge pull request #53 from jpetazzo/cloudinit 
Rework install.sh to work with cloud-init
 2013-03-12 10:31:01 -07:00
Solomon Hykes 6503e7197f Merge pull request #43 from kencochrane/vagrant-fix 
Vagrant fix
 2013-03-12 10:30:08 -07:00
creack 13753c9917 Merge master within fs 2013-03-12 08:33:21 -07:00
Guillaume J. Charmes e45af34965 Merge branch 'fs' of https://github.com/dotcloud/docker into fs 2013-03-12 05:37:07 -07:00
Guillaume J. Charmes f06f9a6359 Put back the relative paths for dev purpose 2013-03-12 05:17:51 -07:00
shin- 3bd9c9d822 Merge branch 'fs' of github.com:dotcloud/docker into fs 2013-03-12 04:29:06 -07:00
shin- 4da184ee08 post-merge repairs 2013-03-11 07:39:06 -07:00
shin- 1c0d5cb093 Merged upstream changes in fs branch 2013-03-11 05:50:09 -07:00
shin- 25c1a51a42 Merged master branch into fs 2013-03-11 05:42:36 -07:00
Guillaume J. Charmes ae2f443023 Change relative paths to absolute 2013-03-11 02:59:52 -07:00
Solomon Hykes 02e5882e41 gofmt 2013-03-09 19:44:09 -08:00
Solomon Hykes af96b947ba Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-03-06 00:39:35 -08:00
Solomon Hykes 3b2550bd43 Merge pull request #23 from dotcloud/networking 
Functional TCP networking: port allocation, inbound DNAT, outbound SNAT, multiple ports.
 2013-02-28 16:32:55 -08:00
Andrea Luzzardi 8e3683505d Merge branch 'master' into networking 2013-02-28 11:52:52 -08:00
shin- 232d733d1d Merge branch 'master' into fs 2013-02-26 17:45:55 -08:00
Andrea Luzzardi 3e5197f270 Merge from master 2013-02-26 17:32:07 -08:00
Solomon Hykes bb185f15d5 go fmt 2013-02-26 17:26:46 -08:00
Andrea Luzzardi 447fbf5778 Merge branch 'master' into networking 2013-02-26 11:04:28 -08:00
Andrea Luzzardi 0bb28fdca1 Merge branch 'master' into networking 2013-02-26 11:03:11 -08:00
Solomon Hykes f3fd528852 Merge pull request #19 from brianm/master 
Ignore .vagrant directory
 2013-02-23 13:11:39 -08:00
Solomon Hykes f0be2b3096 Interactive mode preserves existing PATH, to facilitate scripting 2013-02-20 14:45:43 -08:00