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
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
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
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
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
66f4744981
enable docker run -it
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3839e3a0f63c8acc4cb11a87b862f159e5b2aedc
Component: engine
2014-02-24 22:53:00 +00:00
57d4919fc6
Fix kill signals and rootfs path for pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a6e5e1851197ccc262c61190d5904dd410293466
Component: engine
2014-02-24 14:35:27 -08:00
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
4c203f5a85
Add info for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cfd188e9251f5047e4fd677fe8f2921ae28b8bcc
Component: engine
2014-02-24 14:11:09 -08:00
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
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
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
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
3e4914e9af
Honor user passed on container in nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1c79b747bb10a389249aba90ad217ca0128afb74
Component: engine
2014-02-24 13:52:56 -08:00
9ab15c1e2d
Added documentation for docker.io OAuth & Accounts
...
OAuth docs:
documented the OAuth authorization flow and how to register your application
Account docs:
documented getting/updating user profile data
documented getting/updating user email data
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 00bb76f35b4d21d0aaddb23f93d663ec02faea1a
Component: engine
2014-02-24 13:48:43 -08:00
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
07cc777e62
Fix tests with dockerinit lookup path
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 01f9815b55742654b2f35d13c3aba6a9e48634c7
Component: engine
2014-02-24 13:40:17 -08:00
28b09e351d
registry: Removed checksumPayload from exported fields
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: 522c0765f11569feb1dbc7facfbb802e0f1fb84e
Component: engine
2014-02-24 12:40:33 -08:00
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
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
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
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
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
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
54e2291890
Compile nsinit into docker for use with dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8f20058307cb30c9697b8dbee1c7bf2b1e0ba766
Component: engine
2014-02-24 12:21:13 -08:00
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
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
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
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
e69a84baec
Engine: clearer job error reporting
...
* Job.Error and Job.Errorf always print a newline.
* Avoid redundant prefixing of error messages.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 8a1778301bffaf46abbce5cb76c1add47bd241a0
Component: engine
2014-02-24 11:53:56 -08:00
ff03fe8ca2
Merge pull request #4249 from shykes/builtins
...
Register built-in engine commands at runtime instead of compile-time
Upstream-commit: c63ce728cfa27cf84dff5484ef46c72dbfb1560a
Component: engine
2014-02-24 11:40:09 -08:00
ccb00fe481
Merge pull request #4281 from unclejack/remove_vagrantfile
...
Remove Vagrantfile and remove it from all docs
Upstream-commit: 8cfa7715c738756af8a0d5732fe7716882da3a95
Component: engine
2014-02-24 11:39:11 -08:00
f14c0fd180
Engine.ParseJob: create a new job from a shell-like text command.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 2019a73f0387af273be3b6e085fdae0e5a67ba3b
Component: engine
2014-02-24 11:38:13 -08:00
95f410bd66
Cleanup integration tests
...
Refactor integration tests to remove special cases in the creation of
test engines. All test engines are now created through newTestEngine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 92c3927b5de73f81c490900b2718d218ec097bd3
Component: engine
2014-02-24 19:24:30 +00:00
14989a215e
Register built-in engine commands at runtime instead of compile-time
...
This allows selective loading of commands, and paves the way to dynamic
plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 919665a20a41f8e1b105342b1864ec05eb50cc97
Component: engine
2014-02-24 19:24:29 +00:00
8e9af7eea8
Merge pull request #4293 from cpuguy83/patch-1
...
Doc: Remove uneeded wording in Dockerfile format
Upstream-commit: aed7fe1cda0332c6af29f427a0b6b03fba51a50a
Component: engine
2014-02-24 11:05:25 -08:00
abd15e7ec6
Merge branch 'libcontainer-in-docker' into add-libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 89dbdb1f7196f72bae3adcc4ebf6abcce178ddcc
Component: engine
2014-02-24 10:49:49 -08:00
7ebf071730
Look for cpu subsystem instead of memory
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a08e78a78c4b548919515fa7910db56990ef44dc
Component: engine
2014-02-24 10:46:20 -08:00
d6c00b381a
seperate out the terminal functions from lxc to the pkg/term
...
Since these functions are indepenent of lxc, and could be used by
other drivers.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: de848a14caf1636cc24e621a35d7073cebe5444d
Component: engine
2014-02-24 13:42:09 -05:00
5561829e30
registry: Fixed tests
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: f420bb29793f0196024d21121d0ef89d2c678bdf
Component: engine
2014-02-24 09:04:27 -08:00
f208199d26
registry: Added simple checksums (sha256) for layers
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: 8d230cf89cfe3c6c5293d7807c1bffa1cf799d6b
Component: engine
2014-02-23 18:50:04 -08:00
09b4fa1ad0
Remove uneeded wording in Dockerfile format
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: cfdfd46e49404ad9dfb28810bd7a83658f35c42b
Component: engine
2014-02-23 15:45:44 -05:00
afb31c48bd
Remove trailing slash from host parameter in docker init.
...
(This causes errors on Docker 0.8)
Docker-DCO-1.1-Signed-off-by: Morgante Pell <morgante.pell@morgante.net > (github: morgante)
Upstream-commit: 2a7f7c86da00210cb90eafd77ee01354f98ec4fc
Component: engine
2014-02-23 23:42:54 +04:00
3e5bd59386
Extract our default PATH value to a constant for great reuse
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b3ffc1f8358a9aa89448b37ea630c5783f0672d8
Component: engine
2014-02-22 20:01:45 -07:00
45e14307e8
Merge pull request #4246 from Ximion/master
...
contrib/debootstrap: Add initial support for Tanglu
Upstream-commit: ed8466c44c93a523176022df118760bc1a359801
Component: engine
2014-02-22 14:58:14 -07:00
6253b6b7aa
contrib/debootstrap: Add initial support for Tanglu
...
This will add support for Tanglu, a Debian based Linux-distribution.
Docker-DCO-1.1-Signed-off-by: Matthias Klumpp <matthias@tenstral.net > (github: Ximion)
Upstream-commit: 4bfc8e97222b8908176d2420060bbeae613a571c
Component: engine
2014-02-22 17:25:52 +01:00
0b2fdfff35
Fix tty copy for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 172260a49be6c3516edc6869d58957e844f9c69b
Component: engine
2014-02-22 01:28:59 -08:00
0c8ed4441e
Refactor driver to use Exec function from nsini
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fac41af25bd5f42269424a788783a4280dd7fc9c
Component: engine
2014-02-22 01:21:26 -08:00
db3809fb13
Abstract out diff implementations for importing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ae423a036e6f884572491b1ff5ef8a626b1592aa
Component: engine
2014-02-22 00:29:21 -08:00
5daf4091ff
Add syncpipe for passing context
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2412656ef54cb4df36df2f8122e1fda24ec8e8a4
Component: engine
2014-02-21 22:58:30 -08:00
