Victor Vieux
0ca7df046b
fix EventsListeners in docker info
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 19:06:36 +00:00
Victor Vieux
142213ade8
Merge pull request #4379 from vieux/remove_warnings_twice
...
remove WARNING writter twice
2014-02-28 10:31:25 -08:00
unclejack
b4146fbe48
Merge pull request #4376 from vieux/fix_lxc_version
...
fix docker info with lxc 1.0.0
2014-02-28 20:04:11 +02:00
Brian Goff
d78fcb32ff
Add ability to force removal of running container via docker rm -f
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-27 23:31:36 -05:00
Victor Vieux
f67e725e68
remove WARNING writter twice
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 02:40:15 +00:00
Victor Vieux
6104f9f949
fix fedora tty with apparmor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 01:20:10 +00:00
Victor Vieux
f30f823bf5
fix docker info with lxc 1.0.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 00:32:58 +00:00
Josh Hawn
b6a5082bd1
Updated OAuth docs per arothfusz's comments
...
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
2014-02-27 14:21:24 -08:00
Sven Dowideit
cdec3297f7
add a little bit mentioning commandline option combinations
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-28 08:14:22 +10:00
Michael Crosby
44c3b71332
Ensure that ticker does not leak
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 11:40:25 -08:00
Victor Vieux
31e08fdc96
Merge pull request #4369 from tianon/better-archive-tar-vendor-import-path
...
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
2014-02-27 10:37:38 -08:00
Andy Rothfusz
ce8a735248
Merge pull request #4318 from robpc/patch-1
...
Fixed typo in Dockerfile example
2014-02-27 10:19:09 -08:00
Michael Crosby
fdeea90fc8
Allow child process to live if daemon dies
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 09:33:36 -08:00
Tianon Gravi
e6784be628
Merge pull request #4365 from maztaim/master
...
Use mknod instead of MAKEDEV in mkimage-yum.sh
2014-02-27 10:14:22 -07:00
Tianon Gravi
2ca4e0ea60
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-27 09:43:44 -07:00
Michael Crosby
a115ce797b
Ensure that the container dir is remove on restore
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 08:28:55 -08:00
Tim Bosse
1d82091756
Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh.
...
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org > (github: maztaim)
2014-02-26 22:34:42 -05:00
Michael Crosby
fb08b8b221
Code review updates
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 19:21:46 -08:00
Michael Crosby
01dc79b3ea
Merge pull request #4276 from tianon/json-stream-newlines
...
Add newlines to the JSON stream functions
2014-02-26 21:25:42 -05:00
Victor Vieux
389eba4396
Merge pull request #4297 from dotcloud/add-simple-checksum
...
registry: Added simple checksums (sha256) for layers
2014-02-26 18:15:48 -08:00
Michael Crosby
7cd2245947
Ensure that loopback devices are mounted inside the conatiner
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 17:21:09 -08:00
robpc
1475dafd52
Fixed typo in Dockerfile example
...
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com > (github: robpc)
The 'true' command is located in /bin not /usr/bin in the busybox image.
2014-02-26 19:38:51 -05:00
Michael Crosby
70820b69ec
Make network a slice to support multiple types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 14:20:41 -08:00
Michael Crosby
ce08083f9c
Merge branch 'master' into add-libcontainer
...
Conflicts:
execdriver/termconsole.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 12:55:24 -08:00
Michael Crosby
0e356d49aa
Merge pull request #4346 from creack/fix_race_exit_code
...
Fix exit code issue with TTY mode
2014-02-26 15:32:01 -05:00
Victor Vieux
5908aa350d
Merge pull request #4357 from creack/fix_TestCmdKill
...
Fix TestCmdKill by closing the pipe before waiting on the container
2014-02-26 12:20:30 -08:00
unclejack
bde192bb80
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
2014-02-26 21:30:24 +02:00
unclejack
22da8cdc7e
Merge pull request #4282 from ibuildthecloud/jumbo-frames
...
Add MTU to lxc conf to make host and container MTU match
2014-02-26 20:11:38 +02:00
unclejack
31ddc16692
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
2014-02-26 19:03:59 +02:00
Brian Goff
0b4aeb79d9
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-26 11:04:06 -05:00
unclejack
d8b60cb592
Merge pull request #4308 from vbatts/vbatts-seperate_driver_term
...
seperate out the terminal functions from lxc
2014-02-26 16:58:21 +02:00
unclejack
b8a8c0c686
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
2014-02-26 16:33:02 +02:00
unclejack
a42ef866ed
Merge pull request #4316 from tianon/more-lenient-kernel-version
...
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
2014-02-26 16:15:56 +02:00
unclejack
22861b42ee
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
2014-02-26 15:59:52 +02:00
unclejack
94001dc6c6
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
2014-02-26 15:45:38 +02:00
Tianon Gravi
b5ba89596e
Merge pull request #4348 from tianon/fix-yum-tagging
...
Update mkimage-yum to not read /etc/redhat-release from the host
2014-02-25 23:46:04 -07:00
Tianon Gravi
d29ee876ac
Update mkimage-yum to not read /etc/redhat-release from the host
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-25 23:35:59 -07:00
Guillaume J. Charmes
4039fbb1b0
Fix TestCmdKill by closing the pipe before waiting on the container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 20:16:17 -08:00
Michael Crosby
6016126c71
Fix cgroups swap issue when it is not supported
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 19:45:57 -08:00
Michael Crosby
bfdf07ac98
Return error for lxc-conf when using native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 17:13:00 -08:00
Guillaume J. Charmes
3806ff61d1
Fix exit code issue with TTY mode
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 16:50:33 -08:00
Michael Crosby
5c67d2e634
Ensure that the container's dir is remove from native driver on stop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 16:27:07 -08:00
Sam Alba
a0251223cd
registry: Fixed unexported field
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-02-25 16:06:04 -08:00
Victor Vieux
2f468a498a
update api Maintainers file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 23:19:44 +00:00
Michael Crosby
93ed15075c
Fix cross compile for make cross
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 15:19:13 -08:00
Andy Rothfusz
d373cb8c89
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
2014-02-25 15:03:30 -08:00
Victor Vieux
386e7c80c0
fix content-type docker copy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 22:49:19 +00:00
Victor Vieux
8dad771daa
add version pkg
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:38 +00:00
Victor Vieux
10faefac3b
add missing doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
Victor Vieux
3f6324f0e8
fix bad rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00