unclejack
a01a267fdb
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
Upstream-commit: bde192bb80079ad89057a6df5ce676c5b3429901
Component: engine
2014-02-26 21:30:24 +02:00
unclejack
c5ba66b375
Merge pull request #4282 from ibuildthecloud/jumbo-frames
...
Add MTU to lxc conf to make host and container MTU match
Upstream-commit: 22da8cdc7e862dbc54806dc935f4ef079be22654
Component: engine
2014-02-26 20:11:38 +02:00
unclejack
1d5826bd31
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
Upstream-commit: 31ddc1669250565bdf41bc5329d16eb7e5bd7227
Component: engine
2014-02-26 19:03:59 +02:00
Brian Goff
0eecb77d00
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
unclejack
360444d431
Merge pull request #4308 from vbatts/vbatts-seperate_driver_term
...
seperate out the terminal functions from lxc
Upstream-commit: d8b60cb5929b35d35695708ffb8595bc55d2b37f
Component: engine
2014-02-26 16:58:21 +02:00
unclejack
e002afd39f
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
Upstream-commit: b8a8c0c686837b63650c58a6d0f76dfb0c7810f4
Component: engine
2014-02-26 16:33:02 +02:00
unclejack
4e0301e92e
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"
Upstream-commit: a42ef866ed19fc3bd8d1732ee88458e250e7491f
Component: engine
2014-02-26 16:15:56 +02:00
unclejack
f86c167e50
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
Upstream-commit: 22861b42ee22239a1e51e5297fe6ccb96e474990
Component: engine
2014-02-26 15:59:52 +02:00
unclejack
2ca7075e82
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
Upstream-commit: 94001dc6c6bfa146978e2a36dbc4bb772e935b04
Component: engine
2014-02-26 15:45:38 +02:00
Tianon Gravi
9bc4c31d86
Merge pull request #4348 from tianon/fix-yum-tagging
...
Update mkimage-yum to not read /etc/redhat-release from the host
Upstream-commit: b5ba89596e6f731cf3f561a07276920401d43edf
Component: engine
2014-02-25 23:46:04 -07:00
Tianon Gravi
7413b7bf4d
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)
Upstream-commit: d29ee876ac7900730e1f48f4f30ed33210872238
Component: engine
2014-02-25 23:35:59 -07:00
Victor Vieux
b5a919751c
update api Maintainers file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 2f468a498ab9e8ebc5c7a9316e0242f8d7c54f1a
Component: engine
2014-02-25 23:19:44 +00:00
Andy Rothfusz
7c7e0318a0
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
Upstream-commit: d373cb8c89f40a6d293cbb01b094c4e947057343
Component: engine
2014-02-25 15:03:30 -08:00
Victor Vieux
1361d66b6f
fix content-type docker copy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 386e7c80c0dad778f873bcd6eadfa94ecb1ac840
Component: engine
2014-02-25 22:49:19 +00:00
Victor Vieux
af968e2231
add version pkg
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8dad771daa6572ca15949d3e53e825f4837c0af9
Component: engine
2014-02-25 21:08:38 +00:00
Victor Vieux
cae176477e
add missing doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 10faefac3b88069f22283f3f2e018d100a66f2b9
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
5892660f0a
fix bad rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3f6324f0e8e1b4d117a5d22f752e1d5980eea939
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
4637d495ff
fix doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 21f56c04e4f4df4e171985896b54b243c6ef0fcb
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
dde3a7b467
fix message 'No such image: ubuntu' => 'No such image: ubuntu:latest'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 626cee87f779dff2840b1a31cbe6912545758a9f
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
fcbc1feb4a
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 964d82d00506c3005d102b9a1f94848182c5989d
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
a7de7303da
:= / var
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c7f825c0f08e8b6e3cd9dcebc81c21002afcf133
Component: engine
2014-02-25 21:08:08 +00:00
Victor Vieux
0820020142
bump API version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e7cc88c39f302c020f70a00bca54bddeecb608a4
Component: engine
2014-02-25 21:08:07 +00:00
Victor Vieux
0724fa65be
Rewrite docker rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 795ed6b1e511fa6713fbc9ea4e8569aab15b98ff
Component: engine
2014-02-25 21:08:07 +00:00
Michael Crosby
4cb1793cd9
Merge pull request #4335 from tianon/what-the-etc-group
...
Convert api/server.go to also use the handy user package
Upstream-commit: 79089720c4d4f5f2a0e1afd567babd2d3c55941f
Component: engine
2014-02-25 15:50:53 -05:00
Tianon Gravi
52e14d4517
Convert api/server.go to also use the handy user package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7bce5957a08ae31f4b83d1a13ad056e5b2af15e1
Component: engine
2014-02-25 13:07:19 -07:00
Solomon Hykes
764f9b0016
Merge pull request #4314 from shykes/engine-commands
...
Engine: builtin command 'commands' returns a list of registered commands
Upstream-commit: 56584a92f43f7f05789b345970d672bcbbdd32b0
Component: engine
2014-02-25 09:59:26 -08:00
Vincent Batts
fbca607ce0
correcting the package name for the terminal setup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: c35853191ccd9ca8fe91b666d598eac3e4e12c67
Component: engine
2014-02-25 10:07:06 -05:00
Victor Vieux
61c173dbcd
fix divide by zero error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b7a0f62f0f9079d0d628a284a77af0c474eb9375
Component: engine
2014-02-25 08:01:46 +00:00
Michael Crosby
781668c938
Merge pull request #4189 from vbatts/vbatts-execdriver_flag
...
execdriver flag for docker daemon
Upstream-commit: c9addff4449d0d6671373b9a6376fbe94bb43fb4
Component: engine
2014-02-24 23:28:17 -05:00
Tianon Gravi
5201e26b23
Merge pull request #4296 from morgante/patch-1
...
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
Upstream-commit: b5517db808ef38e4ba3c1303affe110c0784af07
Component: engine
2014-02-24 16:27:31 -07:00
Guillaume J. Charmes
d35395f8ee
Merge pull request #4309 from crosbymichael/change-cgroup-subsystem
...
Use the cpu cgroup subsystem instead of memory because its non optional
Upstream-commit: b6d4c27fcdbdae0df37f1fc67631a9af4eb991c5
Component: engine
2014-02-24 15:24:51 -08:00
unclejack
8472fab608
Merge pull request #4313 from shykes/api-common
...
api/common.go
Upstream-commit: b2064f2ce6b331a7f7428ce8d473f56bc4670863
Component: engine
2014-02-25 01:11:53 +02:00
Victor Vieux
1ab53bd0df
fix gofmt
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 4434b63ff44c6994366afebeceb9b570bb9ee26c
Component: engine
2014-02-24 23:10:45 +00:00
Tim Ruffles
f820af7110
help contributors be more productive
...
certainly saved me time after I found this in hack/make.sh :)
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk > (github: github_handle)
Upstream-commit: 9c4799b7e7627b21f2748458e46d697c3ee4981e
Component: engine
2014-02-24 23:07:40 +00:00
Victor Vieux
c924c9e051
Merge pull request #4315 from shykes/engine-parsejob-test
...
Engine: add tests for ParseJob()
Upstream-commit: ad88d0be83fa317010fbeabe09471948256b1207
Component: engine
2014-02-24 14:27:19 -08:00
Tianon Gravi
75583d8b55
Merge pull request #4320 from vieux/buffer_test_integration_line_by_line
...
Add --line-buffered to the integration test output filtering
Upstream-commit: 88b774d092bd4626ca5373892ea50dc04d546302
Component: engine
2014-02-24 15:09:21 -07:00
Victor Vieux
3e5dfdfe28
Merge pull request #4290 from tianon/extract-path
...
Extract our default PATH value to a constant for great reuse
Upstream-commit: 5f15faf5007124fc19905748306fb1cb403b81fc
Component: engine
2014-02-24 14:06:27 -08:00
Victor Vieux
5e82277ab6
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 24ff3a3dc30e455674d28f552a0efb6108a411db
Component: engine
2014-02-24 21:59:01 +00:00
Victor Vieux
102c3daac9
Merge pull request #4312 from shykes/engine-error-reporting
...
Engine: clearer job error reporting
Upstream-commit: 4a4915c8eef8d49f9d68a85f01435301a203acb4
Component: engine
2014-02-24 13:58:12 -08:00
Michael Crosby
8a923765fc
Use the cpu cgroup subsystem instead of memory because its non optional
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 757c7581c8334b6b527d1c922fe5007d5004eca2
Component: engine
2014-02-24 13:42:13 -08:00
Tianon Gravi
e085e22f6b
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ae8180de2d814e04834d41f20b2c96a06995678
Component: engine
2014-02-24 13:38:58 -07:00
Solomon Hykes
1560c87c83
Engine: tiny cosmetic fix
...
To make @creack happy :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 0469e7d0622add573f2f9c357564ff0076db9346
Component: engine
2014-02-24 12:31:39 -08:00
Solomon Hykes
0070aebcd1
Engine: add tests for ParseJob()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: d985fd49843b31b227b46d5ed71914002e2e0de9
Component: engine
2014-02-24 12:31:39 -08:00
Solomon Hykes
171ee11139
Engine: builtin command 'commands' returns a list of registered commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cd846ecb60ad936d58d70762ed91cffa906cef93
Component: engine
2014-02-24 12:29:49 -08:00
Solomon Hykes
32c3efbd4e
Engine: cleanup side effects between tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 62b21daded2ea9b703a6e5fa0479e007016b1edb
Component: engine
2014-02-24 12:29:39 -08:00
Vincent Batts
031e369945
Move the terminal setup to execdriver, instead of ./pkg/term
...
It is independent of any particular driver, but likely used by
multiple execdrivers. Also, pkg/... is not to have any links to
docker, which this terminal setup does.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: fabc478e7e33fd3b3c00c3bd74bad0d87a2c23e3
Component: engine
2014-02-24 15:28:45 -05:00
Tianon Gravi
f1336c7e0c
Merge pull request #4288 from tianon/mkimage-steamos
...
Add "SteamOS" support to mkimage-debootstrap
Upstream-commit: 05e40303134a528b43ca1bf129814ba992a59604
Component: engine
2014-02-24 13:02:04 -07:00
Solomon Hykes
12a406bd28
Merge pull request #4311 from shykes/engine-parsejob
...
Engine.ParseJob: create a new job from a shell-like text command.
Upstream-commit: f14f4aa509c5ab3c7fcb7616583bcb9d8a91ddf4
Component: engine
2014-02-24 11:55:50 -08:00
Tianon Gravi
48edd91d26
Add "SteamOS" support to mkimage-debootstrap (requires a debootstrap script like https://github.com/tianon/gentoo-overlay/blob/master/dev-util/debootstrap-valve/files/scripts/alchemist )
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: cd94c9d66693253ce71d8c691cb937980dd96565
Component: engine
2014-02-24 12:55:04 -07:00
Solomon Hykes
fbf1d0f723
api/common.go: code shared by the server and client implementation of the Docker remote api.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 551355c9adac6a8b36244e1962e7a104611ae4af
Component: engine
2014-02-24 11:54:50 -08:00
unclejack
Brian Goff
Tianon Gravi
Victor Vieux
Andy Rothfusz
Michael Crosby
Solomon Hykes
Vincent Batts
Guillaume J. Charmes
Tim Ruffles
Solomon Hykes