fa69063302
updated Vagrant to support new single binary, and exposing the vagrant shared folder, and setting some ENV variables
...
Upstream-commit: d479efc01ead3da7b57c85a493f957e46c5fa0d1
Component: engine
2013-03-13 13:30:13 -07:00
b90748d032
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: f3d826447d511209746fc901e30ce0d906712598
Component: engine
2013-03-13 13:24:16 -07:00
271123667b
'docker inspect' supports pinned versions again (eg. 'docker inspect PATH:revision')
...
Upstream-commit: f5f26a510f15d96a320b668e10516bc068905b11
Component: engine
2013-03-13 13:23:59 -07:00
fc32abb2ec
Add fixme for the change detection
...
Upstream-commit: 804abddec155dedc42e99ad746f1cf1fdbfe0fed
Component: engine
2013-03-13 13:03:29 -07:00
c9f922121d
Merge branch 'master' into pull-missing
...
Upstream-commit: 8c2ff9374c3a0770689f042fead5a413cc68428a
Component: engine
2013-03-13 19:51:08 +00:00
592f910731
Merged branch 28-standalone
...
Upstream-commit: 89245360e89d725f7c7487dc8cf35836a12eabb8
Component: engine
2013-03-13 12:23:37 -07:00
8e04b25bbd
Fixed formatting in README
...
Upstream-commit: 8d5f683dc47795f6797eb14b498149c612398bd2
Component: engine
2013-03-13 12:00:13 -07:00
1c95edd498
Added usage exmaples to the README
...
Upstream-commit: d614e91b62339d1960cf171c2436404bb1fa8806
Component: engine
2013-03-13 11:58:15 -07:00
bea2df9aa0
Updated README
...
Upstream-commit: baf6988d872be24130fc2923bef227f5365cbf1b
Component: engine
2013-03-13 11:46:09 -07:00
438afadedb
Merge branch 'master' into pull-missing
...
Conflicts:
image/image.go
server/server.go
Upstream-commit: fae8284b16de078c81a9085338934c546079081b
Component: engine
2013-03-13 18:33:48 +00:00
905dafaf18
README: removed superfluous install step
...
Upstream-commit: 895e145e615b407aa485189a8021fd8640700163
Component: engine
2013-03-13 11:28:52 -07:00
8bc8fc57bc
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 41e0c74fd08afb5007320b60b9fe94958dc16155
Component: engine
2013-03-13 11:27:23 -07:00
22fe870560
Moved download binaries to get.docker.io
...
Upstream-commit: d54ff35f022e5e11c5ca124237a1888c4a6161b9
Component: engine
2013-03-13 11:27:06 -07:00
06c0237124
Re-enabled docker rmi
...
Upstream-commit: c3622a963d326df8da8049302e0f2ea4875fc496
Component: engine
2013-03-13 11:14:37 -07:00
b449cc4a56
Merge branch 'master' into 32-aufs_delete_fix
...
Upstream-commit: 77272bea9c7326e53c625ea22b3676e44abfe271
Component: engine
2013-03-13 01:18:55 -07:00
57f43a3fe4
Fix issue #32 , aufs now take into consideration deleted files
...
Upstream-commit: 7cc512c7c065fe52125fe7d6f045d0248d16de80
Component: engine
2013-03-13 01:17:03 -07:00
621d110d7f
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
...
Upstream-commit: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine
2013-03-13 00:29:40 -07:00
95b2e5b159
Merged master
...
Upstream-commit: 86854ffbc5423597d11932eb904cb6fe7dedcac9
Component: engine
2013-03-12 21:53:34 -07:00
906eecfc45
Merged version option by @kencochrane
...
Upstream-commit: 070bc0bb6d316a2a023161a19cba667831a26698
Component: engine
2013-03-12 20:59:47 -07:00
9a8e1b4a6b
fixed formatting issue
...
Upstream-commit: e20a74d2477ea3feb7a9734c15b645d081dbebdf
Component: engine
2013-03-12 17:34:15 -07:00
1fa0ca8238
Add makefile
...
Upstream-commit: c017c7baa41e6f9ce03c18228e1a950cf5bdba3a
Component: engine
2013-03-13 00:30:20 +00:00
0f125b7a99
Remove Curl function from future
...
Upstream-commit: b0265e0a38a71fdbebf3b6ef53120249d399e293
Component: engine
2013-03-12 23:06:07 +00:00
d2cb3c42c7
Only update download/untar progress every 1%. Related to #49
...
Upstream-commit: b5c1cd7991b3b7ea81665b06ad1dd4cb1c8d8b0f
Component: engine
2013-03-12 23:02:50 +00:00
4bba3014fc
Fix "no such image" bug in docker run, introduced last commit. Ref #49,#50
...
Upstream-commit: 2feefb43758e2477b70044e73ed0d800453fe8de
Component: engine
2013-03-12 22:13:21 +00:00
016ee497a3
Add native Go downloading functionality with progress bar. Ref #49 , #50
...
Upstream-commit: 1bfd827701d80a40e65509d45abaa61cd5c748ec
Component: engine
2013-03-12 22:08:10 +00:00
547e13b585
Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
...
Upstream-commit: d2cba75d5f1e8ceea7f301ef146c571806252fa0
Component: engine
2013-03-12 15:05:41 -07:00
6041db20fc
Add Download method for native Go downloading (to replace curl). Catch 404s.
...
Ref: #49 , #50
Upstream-commit: 49554f47f60568c3df942f274ab45d92f451fbcc
Component: engine
2013-03-12 20:50:11 +00:00
6d294cf990
Merge pull request #58 from lopter/master
...
Automatically remove the rcfile generated by docker -i from /tmp
Upstream-commit: f0ef0e393bd24cfe9de7cd08aacd7cda45703e6a
Component: engine
2013-03-12 12:15:34 -07:00
ec87b553c7
Automatically remove the rcfile generated by docker -i from /tmp
...
Upstream-commit: b2de17bf2cfdf90f347109452bcb8763138cff46
Component: engine
2013-03-12 12:12:40 -07:00
b085b8597c
Merge pull request #57 from kencochrane/vagrant-fix
...
upgraded kernel to 3.5.0-25 to fix a kernel bug
Upstream-commit: 71e1afcc563cd064e9776372c63f30239a34fc9e
Component: engine
2013-03-12 12:10:17 -07:00
a31b72360d
upgraded kernel to 3.5.0-25 to fix a kernel bug
...
Upstream-commit: 94baf2c5b9b2eb49b554d933f9997da072905d88
Component: engine
2013-03-12 12:05:04 -07:00
0e7bc1161e
Merge pull request #48 from dotcloud/memorylimits
...
Memorylimits
Upstream-commit: 46dce5918aad5134305d6f1eb6357c822a59bbed
Component: engine
2013-03-12 12:02:49 -07:00
35529bba2c
Put back the github.com path for the import
...
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
7bcb8dcb89
Merge remote-tracking branch 'remotes/chooper/help-ux'
...
Upstream-commit: 2d32dca9e7616fdd007caf953f70a96a140237a4
Component: engine
2013-03-12 11:11:33 -07:00
1957f767a1
Merge pull request #53 from jpetazzo/cloudinit
...
Rework install.sh to work with cloud-init
Upstream-commit: 47c86e7fd9874ece1fbd109168901c78cb6602cf
Component: engine
2013-03-12 10:31:01 -07:00
a130f465ad
Fix merge issue
...
Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc
Component: engine
2013-03-12 08:59:32 -07:00
d6cad8aba4
Merge master within fs
...
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -07:00
8990ed16c8
Add *.orig to .gitignore
...
Upstream-commit: 6908628b555a1583f079f04ed34f5d81ce917459
Component: engine
2013-03-12 08:06:22 -07:00
ee6bd4ea31
Merge branch 'fs' of https://github.com/dotcloud/docker into fs
...
Upstream-commit: d24ce7dfd15b049560f5d06d57c2b7e2c6a5d61a
Component: engine
2013-03-12 05:37:07 -07:00
422044f5c5
'docker run' works with paths as well as image IDs
...
Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa
Component: engine
2013-03-12 05:57:19 -07:00
22687838eb
gofmt
...
Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08
Component: engine
2013-03-12 05:36:37 -07:00
090804e18e
Add TestCommitRun unit test
...
Upstream-commit: f2dc079c05c073d63b10a3c2a2bc784d1e94e82c
Component: engine
2013-03-12 05:35:47 -07:00
7cb2cc835d
Add parent when needed on store.Create, fix the mountpoint on store.layer.
...
Upstream-commit: 2664668388bd2b1d7012b863d4f8d426fda17daf
Component: engine
2013-03-12 05:23:13 -07:00
b9140244d5
Put back the relative paths for dev purpose
...
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
82c8224ed4
Merge branch 'fs' of github.com:dotcloud/docker into fs
...
Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0
Component: engine
2013-03-12 04:29:06 -07:00
e1030605a9
Re-enabled cat, write and ls ; Added creation date to image metadata
...
Upstream-commit: 63dd8f101816c1253ac8d05e10f4f8a4c80f296a
Component: engine
2013-03-12 04:24:26 -07:00
aee1baf2e0
Add "nuke" function to docker tests to avoid disk space waste
...
Upstream-commit: e0b09d4933a289da01508039995bd627ff1392df
Component: engine
2013-03-12 00:08:41 -07:00
26e8bc9499
Add script upload instructions
...
Upstream-commit: b728c1a81fbb441442d635788e814d47436c613f
Component: engine
2013-03-11 23:40:21 -07:00
a66dcb2cd8
Get rid of bashism
...
Upstream-commit: f90f6a0b9248489c43188ca79b9e0dfc306fd8dc
Component: engine
2013-03-11 23:38:11 -07:00
5959f3618b
Try to load, or install, AUFS modules
...
When running precise or quantal, installing the matching -extra kernel
will install the required file.
Upstream-commit: c1fa4efad66a1ae8cbccd7c55bc195be03d94b2f
Component: engine
2013-03-11 23:20:28 -07:00
