bde192bb80
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
2014-02-26 21:30:24 +02:00
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
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
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
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
b8a8c0c686
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
2014-02-26 16:33:02 +02:00
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
22861b42ee
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
2014-02-26 15:59:52 +02:00
94001dc6c6
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
2014-02-26 15:45:38 +02:00
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
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
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
d373cb8c89
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
2014-02-25 15:03:30 -08:00
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
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
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
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
21f56c04e4
fix doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
626cee87f7
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)
2014-02-25 21:08:08 +00:00
964d82d005
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
c7f825c0f0
:= / var
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
e7cc88c39f
bump API version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
795ed6b1e5
Rewrite docker rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
79089720c4
Merge pull request #4335 from tianon/what-the-etc-group
...
Convert api/server.go to also use the handy user package
2014-02-25 15:50:53 -05:00
7bce5957a0
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)
2014-02-25 13:07:19 -07:00
56584a92f4
Merge pull request #4314 from shykes/engine-commands
...
Engine: builtin command 'commands' returns a list of registered commands
2014-02-25 09:59:26 -08:00
c35853191c
correcting the package name for the terminal setup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-25 10:07:06 -05:00
b7a0f62f0f
fix divide by zero error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 08:01:46 +00:00
c9addff444
Merge pull request #4189 from vbatts/vbatts-execdriver_flag
...
execdriver flag for docker daemon
2014-02-24 23:28:17 -05:00
b5517db808
Merge pull request #4296 from morgante/patch-1
...
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
2014-02-24 16:27:31 -07:00
b6d4c27fcd
Merge pull request #4309 from crosbymichael/change-cgroup-subsystem
...
Use the cpu cgroup subsystem instead of memory because its non optional
2014-02-24 15:24:51 -08:00
b2064f2ce6
Merge pull request #4313 from shykes/api-common
...
api/common.go
2014-02-25 01:11:53 +02:00
4434b63ff4
fix gofmt
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 23:10:45 +00:00
9c4799b7e7
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)
2014-02-24 23:07:40 +00:00
ad88d0be83
Merge pull request #4315 from shykes/engine-parsejob-test
...
Engine: add tests for ParseJob()
2014-02-24 14:27:19 -08:00
88b774d092
Merge pull request #4320 from vieux/buffer_test_integration_line_by_line
...
Add --line-buffered to the integration test output filtering
2014-02-24 15:09:21 -07:00
5f15faf500
Merge pull request #4290 from tianon/extract-path
...
Extract our default PATH value to a constant for great reuse
2014-02-24 14:06:27 -08:00
24ff3a3dc3
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 21:59:01 +00:00
4a4915c8ee
Merge pull request #4312 from shykes/engine-error-reporting
...
Engine: clearer job error reporting
2014-02-24 13:58:12 -08:00
757c7581c8
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)
2014-02-24 13:42:13 -08:00
2ae8180de2
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)
2014-02-24 13:38:58 -07:00
0469e7d062
Engine: tiny cosmetic fix
...
To make @creack happy :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
d985fd4984
Engine: add tests for ParseJob()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
cd846ecb60
Engine: builtin command 'commands' returns a list of registered commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:49 -08:00
62b21daded
Engine: cleanup side effects between tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:39 -08:00
fabc478e7e
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)
2014-02-24 15:28:45 -05:00
05e4030313
Merge pull request #4288 from tianon/mkimage-steamos
...
Add "SteamOS" support to mkimage-debootstrap
2014-02-24 13:02:04 -07:00
f14f4aa509
Merge pull request #4311 from shykes/engine-parsejob
...
Engine.ParseJob: create a new job from a shell-like text command.
2014-02-24 11:55:50 -08:00
cd94c9d666
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)
2014-02-24 12:55:04 -07:00
551355c9ad
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)
2014-02-24 11:54:50 -08:00
unclejack