d8e651280a
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
Upstream-commit: 69db8065426f6db4d27a08324b2a729f383f05eb
Component: engine
2014-03-20 23:07:08 -07:00
abc3562e62
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
Upstream-commit: 79c11b19ecd506bd76db391b896cec0d4263183d
Component: engine
2014-03-21 03:13:06 +01:00
ffa18d8ad0
Allow containers to join the net namespace of other conatiners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: be5538d8a8820ac1192c7a5660e0d950927b42d0
Component: engine
2014-03-21 00:48:17 +00:00
b80ed35d06
Merge branch 'proppy-nsinit' into pluginflag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1bedae9107108156d6d272494f1ff27d8b4be590
Component: engine
2014-03-21 00:36:23 +00:00
b5daa68238
Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 87b0df997b35254d9f742926dc7cc0fa0c3bc790
Component: engine
2014-03-21 00:36:09 +00:00
c42d40863c
Add ability to work with individual namespaces
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 70f3b9f4ce67ee54ec226814cdd26db01f69378d
Component: engine
2014-03-21 00:23:34 +00:00
44fe86670a
Allow caps to be toggled in native driver with plugin flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 443a75d5f66e986e9d7740d3f2aaef080aef8ea0
Component: engine
2014-03-21 00:10:24 +00:00
6ed3664799
Harmonize / across all name-related commands/Validate images names
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: 43c3ee3ba154e2480191ed3743391810f23f29af
Component: engine
2014-03-21 00:40:58 +01:00
3490f03690
Dont use custom marshaling for caps and namespaces
...
This also adds an enabled field to the types so that they
can be easily toggled.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c5f9c4bd6933c806490e4f7cb52557cee154dbed
Component: engine
2014-03-20 23:09:01 +00:00
40c5419c0f
Add initial plugin flag to pass lxc and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f7b3e879fc3047ed93ac6b43cd9bf47a25f3d0fc
Component: engine
2014-03-20 22:58:02 +00:00
2352431354
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
2014-03-20 21:51:28 +00:00
aae2fd84d8
Remove the inotifywait hack from our upstart host-integration example that is no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ab0c9b385c47d818a2105c2114573f5beedbd3ba
Component: engine
2014-03-20 14:59:40 -06:00
0164d2be10
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
ca4686cb04
devicemapper: Better/faster shutdown
...
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.
We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.
Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
Component: engine
2014-03-20 17:38:35 +01:00
c2f15d709c
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
2014-03-20 09:10:32 -07:00
d4638ba0e0
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
2014-03-19 22:25:09 -06:00
5c73b528de
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
Upstream-commit: 372b7282cbbd09383ae0844eed9d09161dc20b42
Component: engine
2014-03-19 18:19:25 -06:00
0f7c241763
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 62eb23aed50c9c820836c4b3f515cba2660b5c20
Component: engine
2014-03-20 10:18:08 +10:00
17b4dbb455
I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: a8cc6ebb181abf58b12ed6ee037711f0b2f1eff2
Component: engine
2014-03-20 09:59:54 +10:00
694ecbc3a5
Harmonize / across all name-related commands
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands:Return an error when repeated /
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: e38e977a0410b754b6f318ff973dc15e6d756023
Component: engine
2014-03-20 00:45:29 +01:00
a1f1abe495
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
Upstream-commit: 43124b5613d74ed832ed9f9684506e10ae1c7d98
Component: engine
2014-03-19 17:38:07 -06:00
04a08a7053
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 43febdd432eb8e7dc5988c72710b3d78a5913360
Component: engine
2014-03-20 09:35:58 +10:00
08db157788
Merge pull request #4784 from SvenDowideit/reference-security-doc
...
add a link to the security documentation when we mention the docker group (or -G)
Upstream-commit: f2b01f5fa1fbb54d2dd78e323b936834635a06c0
Component: engine
2014-03-19 17:20:44 -06:00
1cf0c29be4
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 179e2c92d8d02d029d8aa54d53edb82b3fbcea2b
Component: engine
2014-03-20 09:19:47 +10:00
5afb3d1803
add a link to the security documentation when we mention the docker group (or -G)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f3765f96cfb37f6ea9f925f0d3174fe18c4152be
Component: engine
2014-03-20 09:08:52 +10:00
43102e0522
Merge branch 'master' into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: aa63ece2ec8bae9d13c258ad8e771e3a000cc941
Component: engine
2014-03-19 22:05:36 +00:00
d6e39e4b66
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
46fae9d52b
Merge pull request #4703 from netroy/patch-1
...
Document the missing `DisableNetwork` config flag to /containers/create end-point
Upstream-commit: 16ee4958f2d72e302350e659e2435cd31d8a28e5
Component: engine
2014-03-20 07:55:35 +10:00
884fb2e9f1
Merge pull request #3774 from danielnorberg/dns-search-domains
...
configurable dns search domains
Upstream-commit: 3c9ae2b3483bf89de4245884ff5e463dc35818f4
Component: engine
2014-03-19 14:52:49 -07:00
f7bce0a8cc
fix failing test to use kill instead of stop
...
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
2014-03-19 23:23:45 +02:00
9fba82f5c1
api/client: var style tweak
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 78a0105eaf80ed85e2ee236632a2cc16998228f9
Component: engine
2014-03-19 17:09:12 -04:00
be30df7e0d
variable declaration cleanup
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: c657603c612650117b4def976ff40d98ba7c3a21
Component: engine
2014-03-19 16:44:11 -04:00
57f5eae470
fix typo in documentation
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: 698ca9f38d7ccee2c36b98821c74114b95db631b
Component: engine
2014-03-19 16:44:09 -04:00
e64feaf637
Remove duplication of Dns in config merging.
...
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 48cb2f03177732823b4091fd3ddd44b2bef2c58e
Component: engine
2014-03-19 23:20:30 +04:00
2a0a13fcc3
docker save: add and improve docs
...
add usage examples for `docker save ...`
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: e93a16ab48f75311aab155548f32776cbd21dfe6
Component: engine
2014-03-19 14:47:20 -04:00
9788027867
images: assurance and debug info on image layers
...
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 367a679b9270dd9ec6bd647998b6ffe594cfa6ab
Component: engine
2014-03-19 14:34:12 -04:00
02cf69562f
docker save: --output flag
...
for those that do not care to redirect stdout
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5127732c7911988c81eda7bb31ac77fc1dd36ac2
Component: engine
2014-03-19 14:31:22 -04:00
1ac2035314
Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy)
...
document `DisableNetwork` config flag
Upstream-commit: ec3257921da9da0d37df76e26a842f8f4775def0
Component: engine
2014-03-19 19:01:49 +01:00
b5c2e757ec
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
2014-03-19 09:57:23 -07:00
c037f13ab8
configurable dns search domains
...
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
2014-03-19 10:49:25 -04:00
6aee2c6f6c
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
Upstream-commit: d3c5891486a263d96db5b1f8e0f0e0f698ad168d
Component: engine
2014-03-19 07:38:05 -06:00
0ff768e136
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com > (github: vojnovski)
Upstream-commit: 4fd82db4beba03a126dfc557c86d5d52e9066dae
Component: engine
2014-03-19 10:20:10 +01:00
bc7b9146dc
Merge pull request #4727 from andreaturli/master
...
add softlayer installation instructions
Upstream-commit: ccddb33bf493a1a6504c83b60812db4da3b130ff
Component: engine
2014-03-19 01:04:44 -06:00
ee88186110
mention the tgz - other people might like to know
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 53dc2d67fb65037d9891e2fa0f6559d5e4e2ddcc
Component: engine
2014-03-19 14:24:49 +10:00
dc7241d69b
use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 92194f613e37aeb8a387920c3bee42480da0d2ac
Component: engine
2014-03-19 14:12:47 +10:00
a6d7cc047e
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
Upstream-commit: 9bbc11b2aeb0652cf44f0bc583430b37356bef7c
Component: engine
2014-03-19 13:04:02 +10:00
e5eae6a723
Merge pull request #4753 from vieux/clean_container_stop
...
cleanup container.stop
Upstream-commit: 0bb1e3d9a708d8b60e2efe3888fe9edef0574ac5
Component: engine
2014-03-18 18:49:51 -07:00
6a56789e29
Be explicit about binding to all interfaces in redis example
...
Fixes #4021
Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7822b053cbd2288b6c8d9c51a8f495368bc77f35
Component: engine
2014-03-18 17:24:06 -07:00
4caf655f4f
Add sudo clause if your using osx or tcp
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 38a3fc3e0e9b56400b2c7d2fce3bfc7b15395d14
Component: engine
2014-03-18 17:07:45 -07:00
9d78f7e8ee
cleanup container.stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3b1d590269466217ddf203edcef295f6cec9fcee
Component: engine
2014-03-18 23:48:14 +00:00
