Commit Graph

6220 Commits

Author SHA1 Message Date
Guillaume J. Charmes 92c44382e1 OSX compilation
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com> (github: creack)
Upstream-commit: f3c48ec584707a9acaf9d79c2e161dadf1d2c99b
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby 3c99ad7033 General cleanup of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 61a119220d88d20bb1cca111e9c8ba7cdb45d4f6
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby 10d46be0ea Add dynamic veth name
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5428964400ece4cd79cc5d482307df5e8913469f
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby 3f67fdb8ed Implement init veth creation
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34671f20103fb975fed31a03705e04bc65aed239
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby 05ed3c19b6 Simplify namespaces with only nsinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7bc3c012507edcfc5e8ab8523b240ac2bb03fe19
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby a92b2b9a1b Use nsinit as app
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e25065a6b1df09771598d77cc698e4fcf1159bd4
Component: engine
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes 570aeb08e3 Fix ptmx issue on libcontainer
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 18f06b8d16c475568fd023e97eecc138ab052c2d
Component: engine
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes 0ffa3c9f04 Improve general quality of libcontainer
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 93d41e53ae64fd77340c31d3bc5531864ed28779
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby 1da80198b4 Use nsinit for setting up namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 11429457691be3b009c6d9f4cc9fce9150d4e810
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby e746c16a00 WIP moving to nsini
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 72e65b654b75d5087e50cc6366e78bd2f8318bae
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby d60eb0a2dd Make separate nsinit pkg for a dockerinit like init
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 68b049aed4663eb5f6f53241390f7602c1b40c12
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby a326ecddb8 Initial commit of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e8abaf217b887fcd6a157b4f905156bd245f8f0a
Component: engine
2014-02-21 14:56:15 -08:00
unclejack 7b6c247b2e Merge pull request #4284 from crosbymichael/refactor-tty
Move tty into drivers
Upstream-commit: 75e62a60a2eeeee44b50eb77d173567e72c66674
Component: engine
2014-02-22 00:09:54 +02:00
Michael Crosby 28cc135001 Move current tty and pipe impl to lxc driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aac702727ea02b3974a2848748b0713ac583fc84
Component: engine
2014-02-21 13:27:34 -08:00
Michael Crosby a3562ba47c Add CloseWriters back and do an interface cast
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8e2284aaa2364a8e47a8058e65d60813f9cd5089
Component: engine
2014-02-21 12:52:18 -08:00
Michael Crosby b0992a0e99 Move term creation into driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 592c2f6f9a472bda227a03c819f73b8edc7c3320
Component: engine
2014-02-21 12:42:37 -08:00
Michael Crosby a808fdbf65 Change Console to Terminal
Move creation and attach to driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1e742876988546efb876f67f83de6737ee5e9cf6
Component: engine
2014-02-21 12:32:14 -08:00
Michael Crosby 9de10592bc Move console into execdriver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c783c1c1336d8f2d1b08b9cbd8e2298d066750c
Component: engine
2014-02-21 11:47:53 -08:00
Andy Rothfusz dd7ff4fc5b Merge pull request #4280 from dpb587/bugfix-mtu-typo
Fix argument usage typo for docker --mtu
Upstream-commit: 36fd9f3c53621f27ee5346ef52a6dde6d8e1d580
Component: engine
2014-02-21 10:59:42 -08:00
Andy Rothfusz 5cecf0201f Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
small update to API docs to go with #4276
Upstream-commit: 0c8c87d9ff8a4dcc794c137d69ef3fd91527035e
Component: engine
2014-02-21 10:57:51 -08:00
Danny Berger 773b1a3574 Drop -mtu from docs in favor of --mtu only
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: afb565e97c79b87d4563e8e728513ca5b50514c7
Component: engine
2014-02-21 13:43:50 -05:00
Tianon Gravi 56684e6d5f Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 41b1f93bf72e4c012a159a013697090efdcc183b
Component: engine
2014-02-21 11:26:04 -07:00
Manuel Woelker 1377718158 docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api (fixes #2948)
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
Upstream-commit: c3faab3955a6cfb5b36249889269dd8d272e9e8b
Component: engine
2014-02-21 19:25:49 +01:00
Michael Crosby 6dc91ae84c Merge pull request #4271 from DevTable/fixbuildauth
Fix build auth by adding config to the build job environment
Upstream-commit: 81cd2054f6484837029dde93d40c0e44b684bf08
Component: engine
2014-02-21 13:03:31 -05:00
Michael Crosby bd08308ce7 Merge pull request #4260 from unclejack/onbuild_fixes
forbid chained onbuild, from & maintainer triggers
Upstream-commit: ab63975b8e4153f65cc9ce200f20c39caec08664
Component: engine
2014-02-21 12:50:40 -05:00
Danny Berger 1ddffb7445 Fix cli argument usage typo for docker --mtu
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: 8c4160fe61151f38f471e93e7bf98dcbf5406a9e
Component: engine
2014-02-21 10:51:51 -05:00
James Turnbull 6526146793 Merge pull request #4248 from unclejack/https_fixes
don't skip cert check for an example & use HTTPS
Upstream-commit: ea9dd4ca5927dd3694b43287c13fe7f37aaf9108
Component: engine
2014-02-21 10:47:44 -05:00
Darren Shepherd 9b049ad74b Add MTU to lxc conf to make host and container MTU match
If you are using jumbo frames the host side of the veth was being set to
1500.  Docker would set the MTU of the container side of the veth to 9001.
This would lead to a situation in which the two sides of the veth had
different MTU sizes causing issues in network traffic.

Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com> (github: ibuildthecloud)
Upstream-commit: 0db53bd2ecba097c6ace1a1088e11458e139390a
Component: engine
2014-02-21 03:02:06 -07:00
Sven Dowideit 611dddcc47 small update to API docs to go with #4276
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f83e553452db74b73e9de7fa770646e72e7af88f
Component: engine
2014-02-21 17:42:02 +10:00
Tianon Gravi ecb0d90e19 Add newlines to the JSON stream functions
This makes the JSON streams a _lot_ easier to parse in less well-baked JSON parsers, and no less so in better ones.

Line-based JSON streams are very, very common, where simply chunk-based is not very common at all.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 060da572d20dfeee4fe02ce6b975a6cb33e50dbe
Component: engine
2014-02-21 00:07:44 -07:00
Sven Dowideit 2524fdc1ab reinforce that docker build --rm is a good default to use
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e59485e148f5d1ab0cf5ec18ca3bb7c684e8cf7b
Component: engine
2014-02-21 13:51:08 +10:00
Andy Rothfusz 5c958f0de4 Merge pull request #4233 from deedubs/patch-1
FIX: Linux mint troubleshooting tip
Upstream-commit: a5515d27e5da9c4442fa9800b8995236d4b5ef2f
Component: engine
2014-02-20 18:07:39 -08:00
Andy Rothfusz deed4c0865 Merge pull request #4251 from tianon/add-back-grub-info
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
Upstream-commit: 2018d4f9cd1c201d9cb3991b4223cd107daffc63
Component: engine
2014-02-20 18:04:50 -08:00
Andy Rothfusz ed09089e1d Merge pull request #4261 from amouat/patch-1
Fix misspelling
Upstream-commit: bb368b0563e1c7c2055cc49455ce9a7ba126c713
Component: engine
2014-02-20 17:13:54 -08:00
Andy Rothfusz bfeed894f7 Merge pull request #4252 from SvenDowideit/mention-scratch-image
lets talk about the other way to make base images
Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b
Component: engine
2014-02-20 17:12:36 -08:00
Sven Dowideit d2c232c678 Merge pull request #4265 from unclejack/explain_networkmanager_and_dns_problems
docs: explain DNS warnings & how to fix them
Upstream-commit: 7aa403df757db37dcbda34d938bfd6ad57c6a27d
Component: engine
2014-02-21 10:48:35 +10:00
jakedt 5a22c079a1 Fix build command auth by adding the auth config and registry objects to the build job environment.
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
Upstream-commit: 7dcbae485cd46ad4b8af1ea758dd1d2c69f11fbe
Component: engine
2014-02-20 19:22:13 -05:00
Jake Moshenko 733cdcbf96 Fix registry auth by storing the string passed on the command line, and allowing for credential selection by normalizing on hostname. Also, remove remote ping calls from CmdPush and CmdPull.
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
Upstream-commit: 90b0cce07b4f68d8099903f7e1470f79541f45d0
Component: engine
2014-02-20 18:32:33 -05:00
Victor Vieux 33417515da Merge pull request #3845 from alexlarsson/tar-caps
Implement capabilitiy bit storage in layers
Upstream-commit: a6909084e9692024c2859d46c123fb67a8f3d2ad
Component: engine
2014-02-20 12:01:34 -08:00
unclejack 87c3fb28d2 forbid chained onbuild, from & maintainer triggers
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`

It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.

Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b829e96cde4f798bc21f05a763b2f6a623dfe1eb
Component: engine
2014-02-20 20:31:04 +02:00
unclejack c7ecc00d6b docs: explain DNS warnings & how to fix them
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: cae554b32e8c3341767e0efe7b9a8977a499d826
Component: engine
2014-02-20 19:53:05 +02:00
Nolan Darilek 1124129b25 Don't call applyVolumesFrom on containers with volumes already configured (closes #2973)
Docker-DCO-1.1-Signed-off-by: Nolan Darilek <nolan@thewordnerd.info> (github: ndarilek)
Upstream-commit: 937ea1d3805771b0e5763f336f9d64e5996c2c95
Component: engine
2014-02-20 11:18:27 -06:00
Adrian Mouat 6ec2f02312 Fix misspelling
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com> (github: amouat)
Upstream-commit: 88d24df6687d64bf0e19c23973da32eed32fda28
Component: engine
2014-02-20 16:55:07 +01:00
James Turnbull e100a37878 Site ver for Webmaster tools
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: ef826621585a62d9b563e8ab2fd72f731b14817c
Component: engine
2014-02-20 08:51:39 -05:00
Alexander Larsson 7d5d3a982f archive: Handle capabilities in tar files
If a file has a security.capability set, we push this to the tar file.
This is important to handle in e.g. layer files or when copying files
to containers, as some distros (e.g. Fedora) use capability bits as
a more finegrained version of setuid bits, and thus if the capabilites
are stripped (and setuid is not set) the binaries will fail to work.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 3b9953903b12eaca76655311bd44533768f6f3da
Component: engine
2014-02-20 09:23:34 +01:00
Alexander Larsson 8cd94e7ac6 archive: Detect file changes to capability bits
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 87ca750cdc3114a340af1c5bc9394cc5f6242677
Component: engine
2014-02-20 09:23:34 +01:00
Alexander Larsson 91e61d4022 archive: extract xattrs from tarfiles
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: c8428d77fdde41786aa5c0c4e64e0e762f873676
Component: engine
2014-02-20 09:23:34 +01:00
Alexander Larsson 3d478c1043 Archive: Add Add Lgetxattr and Lsetxattr implementations
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: d19e998e7a99d24122da3e98d9886e3b7b4b3501
Component: engine
2014-02-20 09:23:34 +01:00
Sven Dowideit c8d7265499 lets talk about the other way to make base images
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 9f1c69ca7b1b2afd96b4d154431395ee48ada97d
Component: engine
2014-02-20 13:49:15 +10:00
Sven Dowideit d6638f24e8 Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
Correct port range in OS X installation doc
Upstream-commit: d45538f2431ed385bedcf5e11a9104fdee096073
Component: engine
2014-02-20 10:26:11 +10:00