Ken Cochrane
|
fde01381d5
|
puppet fixes for recent vagrant changes
|
2013-03-13 13:31:23 -07:00 |
|
Ken Cochrane
|
d479efc01e
|
updated Vagrant to support new single binary, and exposing the vagrant shared folder, and setting some ENV variables
|
2013-03-13 13:30:13 -07:00 |
|
Solomon Hykes
|
f3d826447d
|
Merge branch 'master' of ssh://github.com/dotcloud/docker
|
2013-03-13 13:24:16 -07:00 |
|
Solomon Hykes
|
f5f26a510f
|
'docker inspect' supports pinned versions again (eg. 'docker inspect PATH:revision')
|
2013-03-13 13:23:59 -07:00 |
|
Guillaume J. Charmes
|
aaaf56e62f
|
Merge pull request #64 from dotcloud/32-aufs_delete_fix
32 aufs delete fix
|
2013-03-13 13:04:55 -07:00 |
|
Guillaume J. Charmes
|
804abddec1
|
Add fixme for the change detection
|
2013-03-13 13:03:29 -07:00 |
|
Charles Hooper
|
8c2ff9374c
|
Merge branch 'master' into pull-missing
|
2013-03-13 19:51:08 +00:00 |
|
Solomon Hykes
|
89245360e8
|
Merged branch 28-standalone
|
2013-03-13 12:23:37 -07:00 |
|
Solomon Hykes
|
8d5f683dc4
|
Fixed formatting in README
|
2013-03-13 12:00:13 -07:00 |
|
Solomon Hykes
|
d614e91b62
|
Added usage exmaples to the README
|
2013-03-13 11:58:15 -07:00 |
|
Solomon Hykes
|
baf6988d87
|
Updated README
|
2013-03-13 11:46:09 -07:00 |
|
Charles Hooper
|
fae8284b16
|
Merge branch 'master' into pull-missing
Conflicts:
image/image.go
server/server.go
|
2013-03-13 18:33:48 +00:00 |
|
Solomon Hykes
|
895e145e61
|
README: removed superfluous install step
|
2013-03-13 11:28:52 -07:00 |
|
Solomon Hykes
|
41e0c74fd0
|
Merge branch 'master' of ssh://github.com/dotcloud/docker
|
2013-03-13 11:27:23 -07:00 |
|
Solomon Hykes
|
d54ff35f02
|
Moved download binaries to get.docker.io
|
2013-03-13 11:27:06 -07:00 |
|
shin-
|
c3622a963d
|
Re-enabled docker rmi
|
2013-03-13 11:14:37 -07:00 |
|
creack
|
77272bea9c
|
Merge branch 'master' into 32-aufs_delete_fix
|
2013-03-13 01:18:55 -07:00 |
|
creack
|
7cc512c7c0
|
Fix issue #32, aufs now take into consideration deleted files
|
2013-03-13 01:17:03 -07:00 |
|
Solomon Hykes
|
745edc49cd
|
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
|
86854ffbc5
|
Merged master
|
2013-03-12 21:53:34 -07:00 |
|
Solomon Hykes
|
070bc0bb6d
|
Merged version option by @kencochrane
|
2013-03-12 20:59:47 -07:00 |
|
Ken Cochrane
|
e20a74d247
|
fixed formatting issue
|
2013-03-12 17:34:15 -07:00 |
|
Jeremy Grosser
|
c017c7baa4
|
Add makefile
|
2013-03-13 00:30:20 +00:00 |
|
Charles Hooper
|
b0265e0a38
|
Remove Curl function from future
|
2013-03-12 23:06:07 +00:00 |
|
Charles Hooper
|
b5c1cd7991
|
Only update download/untar progress every 1%. Related to #49
|
2013-03-12 23:02:50 +00:00 |
|
Charles Hooper
|
2feefb4375
|
Fix "no such image" bug in docker run, introduced last commit. Ref #49,#50
|
2013-03-12 22:13:21 +00:00 |
|
Charles Hooper
|
1bfd827701
|
Add native Go downloading functionality with progress bar. Ref #49, #50
|
2013-03-12 22:08:10 +00:00 |
|
Solomon Hykes
|
d2cba75d5f
|
Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
|
2013-03-12 15:05:41 -07:00 |
|
Charles Hooper
|
49554f47f6
|
Add Download method for native Go downloading (to replace curl). Catch 404s.
Ref: #49, #50
|
2013-03-12 20:50:11 +00:00 |
|
Solomon Hykes
|
f0ef0e393b
|
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
|
b2de17bf2c
|
Automatically remove the rcfile generated by docker -i from /tmp
|
2013-03-12 12:12:40 -07:00 |
|
Solomon Hykes
|
71e1afcc56
|
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 |
|
Ken Cochrane
|
94baf2c5b9
|
upgraded kernel to 3.5.0-25 to fix a kernel bug
|
2013-03-12 12:05:04 -07:00 |
|
Solomon Hykes
|
46dce5918a
|
Merge pull request #48 from dotcloud/memorylimits
Memorylimits
|
2013-03-12 12:02:49 -07:00 |
|
creack
|
453d49573c
|
Put back the github.com path for the import
|
2013-03-12 11:59:27 -07:00 |
|
Solomon Hykes
|
2d32dca9e7
|
Merge remote-tracking branch 'remotes/chooper/help-ux'
|
2013-03-12 11:11:33 -07:00 |
|
Solomon Hykes
|
47c86e7fd9
|
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
|
6193f8b4d4
|
Merge pull request #43 from kencochrane/vagrant-fix
Vagrant fix
|
2013-03-12 10:30:08 -07:00 |
|
creack
|
d91d0da453
|
Fix merge issue
|
2013-03-12 08:59:32 -07:00 |
|
creack
|
150a4fe7e5
|
Merge master within fs
|
2013-03-12 08:33:21 -07:00 |
|
creack
|
6908628b55
|
Add *.orig to .gitignore
|
2013-03-12 08:06:22 -07:00 |
|
Guillaume J. Charmes
|
d24ce7dfd1
|
Merge branch 'fs' of https://github.com/dotcloud/docker into fs
|
2013-03-12 05:37:07 -07:00 |
|
shin-
|
de50c9c4e8
|
'docker run' works with paths as well as image IDs
|
2013-03-12 05:57:19 -07:00 |
|
Guillaume J. Charmes
|
45a8bba15e
|
gofmt
|
2013-03-12 05:36:37 -07:00 |
|
Guillaume J. Charmes
|
f2dc079c05
|
Add TestCommitRun unit test
|
2013-03-12 05:35:47 -07:00 |
|
Guillaume J. Charmes
|
2664668388
|
Add parent when needed on store.Create, fix the mountpoint on store.layer.
|
2013-03-12 05:23:13 -07:00 |
|
Guillaume J. Charmes
|
18f4e7e196
|
Put back the relative paths for dev purpose
|
2013-03-12 05:17:51 -07:00 |
|
shin-
|
8158616d61
|
Merge branch 'fs' of github.com:dotcloud/docker into fs
|
2013-03-12 04:29:06 -07:00 |
|
shin-
|
63dd8f1018
|
Re-enabled cat, write and ls ; Added creation date to image metadata
|
2013-03-12 04:24:26 -07:00 |
|
Guillaume J. Charmes
|
e0b09d4933
|
Add "nuke" function to docker tests to avoid disk space waste
|
2013-03-12 00:08:41 -07:00 |
|