173cbcacdb
Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c7840f522c37d2c964e442c5acac745f702b8801
Component: engine
2014-02-13 10:27:45 -07:00
1e6f0f8de2
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
Upstream-commit: f794fbc2306e633916b7f000d441d234e198fc24
Component: engine
2014-02-13 09:56:14 -07:00
3c5478c15e
Merge pull request #4056 from alexlarsson/fix-devmapper-test
...
devicemapper: Fix tests on fedora
Upstream-commit: 47df7a360ad10660639af4bef32afaa29b16ee1c
Component: engine
2014-02-13 15:06:50 +02:00
972ffb5ee2
Merge pull request #4073 from crosbymichael/fix-docker-cp-close
...
Ensure docker cp stream is closed properly
Upstream-commit: c6edac9a1a33835e7ab0ea3173877f9731ec45a5
Component: engine
2014-02-13 14:12:53 +02:00
93967c393a
Merge pull request #4111 from merriam/patch-4
...
Minor error in example code (resubmit #4109 )
Upstream-commit: cddea301ab4a4d5ba32c1d1bb22f029fcf1a8edd
Component: engine
2014-02-12 18:34:17 -08:00
52f3c9ec6e
Merge pull request #4112 from merriam/patch-3
...
(resubmit #4110 ) Add notes about OS/X and remote daemons
Upstream-commit: 9d7515545944b294daae3883eceb75c53fc1b783
Component: engine
2014-02-12 18:33:11 -08:00
60f7a02d07
Minor error in example code (resubmit #4109 )
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
Upstream-commit: ba650e05177bcc2597606b998a104a29698d5064
Component: engine
2014-02-12 18:13:46 -08:00
8934e64a02
(resubmit) Add notes about OS/X and remote daemons
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
Upstream-commit: 2a17bdce9e6e25e9be225fede7aac0b12729d82f
Component: engine
2014-02-12 18:11:01 -08:00
9cd54a87e2
Merge pull request #4090 from SvenDowideit/add-install-make-git-to-devenv
...
tell the reader that they need git and make for this tutorial
Upstream-commit: 989fee2490b0d4ed6fd76e668ace6769f7d908ee
Component: engine
2014-02-12 15:48:39 -08:00
52e8fe9f05
Merge pull request #3947 from maxamillion/maxamillion/add_redhat_sysvinit
...
Add sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
Upstream-commit: e7f91a6456dd8c3bb48ac23165607057c193c49e
Component: engine
2014-02-12 11:11:42 -07:00
536d661ab7
Merge branch 'master' into maxamillion/add_redhat_sysvinit
...
* master: (64 commits)
Move the canonical run configuration objects to a sub-package
Remove useless code in client implementation of 'run'.
pkg/opts: a collection of custom value parsers implementing flag.Value
Move api-specific code to the api package
Fix the tests, too
Fix the one spot I missed dockerversion
fix underline/heading
New package `nat`: utilities for manipulating the text description of network ports.
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Move even more stuff into dockerversion
fix underline/heading
Move docker version introspection to a sub-package.
add port forwarding notes for mac/boot2docker docs
Update remote_api_client_libraries.rst
Avoid extra mount/unmount during container registration
add a little more information about the docker run -P option
lxc: Drop NET_ADMIN capability in non-privileged containers
devmapper: Remove directory when removing devicemapper device
add a little info on upgrading
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
...
Upstream-commit: e36d4d88219192269599c7273bcba4f5fcf0fb4e
Component: engine
2014-02-12 12:04:02 -06:00
b2a134f727
Added sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com > (github: maxamillion)
Upstream-commit: 2222cba5acd3fe663d492d7bc3fd4787d4c9869f
Component: engine
2014-02-12 12:03:32 -06:00
3648d21c65
tell the reader that they need git and make for this tutorial
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: d9f215eb2a48e6e836af9cc4015c73f17dc5be9e
Component: engine
2014-02-12 16:30:18 +10:00
d08749138a
Merge pull request #4085 from shykes/separate-config-hostconfig
...
Move canonical run configuration objects to a sub-package
Upstream-commit: d3c084beeec1b89940f304b3d123f5f810fe5ff8
Component: engine
2014-02-11 23:37:40 -05:00
138c42e7c0
Merge pull request #4089 from shykes/autopull-useless-code
...
Remove useless code in client implementation of 'run'.
Upstream-commit: 19755bcdae9cb1b8ce28d068cf83d16fcf7273e9
Component: engine
2014-02-11 23:23:12 -05:00
e378922981
Move the canonical run configuration objects to a sub-package
...
* Config is now runconfig.Config
* HostConfig is now runconfig.HostConfig
* MergeConfig is now runconfig.Merge
* CompareConfig is now runconfig.Compare
* ParseRun is now runconfig.Parse
* ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
* ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob
This facilitates refactoring commands.go and shrinks the core.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
2014-02-11 20:18:46 -08:00
15bba51638
Remove useless code in client implementation of 'run'.
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: e3140e1e69b24f32ffcc2dd94b7d82ad9305a7bc
Component: engine
2014-02-11 20:16:58 -08:00
5c232a828b
Merge pull request #4074 from shykes/separate-version
...
Move docker version introspection to a sub-package.
Upstream-commit: 9a9690360c9b013f3962bee74c18397bd411cc6b
Component: engine
2014-02-11 20:16:00 -08:00
4780092833
Merge pull request #4083 from shykes/api-validate-host
...
Move api-specific code to the api package
Upstream-commit: 28e4de8bfacc610bfa3a0e15cc633e406ea9e9f5
Component: engine
2014-02-11 20:10:35 -08:00
9d4f77997b
Merge pull request #76 from tianon/fix-broken-eagle-tests
...
Fix the tests, too
Upstream-commit: 0dc9c5531eaefbf00c1ebea28465fc4c74cf2118
Component: engine
2014-02-11 20:07:47 -08:00
faccead7fb
pkg/opts: a collection of custom value parsers implementing flag.Value
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: e6e320acc757f22e113da755293583402c6c1e7c
Component: engine
2014-02-11 19:59:52 -08:00
cbe391a3ed
Move api-specific code to the api package
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: e08a1c53aa5a19a17d40d41accbab040611c4411
Component: engine
2014-02-11 19:59:52 -08:00
e8ca8bfeb8
Fix the tests, too
...
Seriously. There's not much codebase left we haven't touched.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 0d871840b202fc31418990bbcbe0df1c4ad689fb
Component: engine
2014-02-11 19:10:23 -07:00
a5dcd8d987
Merge pull request #4079 from shykes/separate-nat
...
New package `nat`: utilities for manipulating the text description of network ports
Upstream-commit: 6da1e092dc222b17a296009de55d8216dfcfe612
Component: engine
2014-02-11 20:45:58 -05:00
dd7c566ac6
Merge pull request #75 from tianon/fix-my-broken-eagle
...
Fix the one spot I missed dockerversion
Upstream-commit: b609e28e5c7168475c09749e308c6025a715120f
Component: engine
2014-02-11 17:32:11 -08:00
2b6a0d82a2
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ea725fdc530e989516fae60f5dafecb139d75b8
Component: engine
2014-02-11 18:23:17 -07:00
1cb1e79554
fix underline/heading
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 6fd8e5d976e872447447d8c25d20d525305f281d
Component: engine
2014-02-11 16:53:08 -08:00
944b4ea1c7
New package nat: utilities for manipulating the text description of network ports.
...
This facilitates the refactoring of commands.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 3ecd8ff0c80c593e1874cbfa0cc2abf946eeaf66
Component: engine
2014-02-11 16:51:01 -08:00
c691ff08d3
Merge pull request #4034 from SvenDowideit/postgres-example
...
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Upstream-commit: e9e4b8dc15fcf01fb793cd65ebfa822420d56fe8
Component: engine
2014-02-11 16:49:22 -08:00
afbabaccff
Merge pull request #4050 from SvenDowideit/put-back-LGTM
...
bring back the explanation of our LGTM process
Upstream-commit: 6b925a49919ae12129e915ce542c7280faf99641
Component: engine
2014-02-12 10:41:49 +10:00
11f8cb78e5
Merge pull request #74 from tianon/more-separate
...
Move even more stuff into dockerversion
Upstream-commit: 619ad8421611e774a851b7be81ba8ae0a31963a2
Component: engine
2014-02-11 16:37:27 -08:00
afe2170b4f
rewrite the PostgreSQL example using a Dockerfile, and add details to it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2ed2ba4e8caa2d70d57d124a2f3509f400d8187e
Component: engine
2014-02-12 10:30:57 +10:00
da8055c21a
Merge pull request #3988 from dafyddcrosby/fix_formatting
...
Fix RST formatting
Upstream-commit: 73967417579a44a4597e8d3e818248f8c98a1c97
Component: engine
2014-02-11 16:30:21 -08:00
04ccad7a77
Merge pull request #4057 from SvenDowideit/add-P-docs
...
add a little more information about the docker run -P option
Upstream-commit: 7fe8b50e2ee9ba0b237827f95980dcf6e1a41fb4
Component: engine
2014-02-11 16:27:25 -08:00
9ed97b673b
Move even more stuff into dockerversion
...
Also, use it in all the places. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
2014-02-11 17:26:54 -07:00
ba35f17949
Merge pull request #4054 from SvenDowideit/boot2docker-upgrade-doc
...
add a little info on upgrading b2d
Upstream-commit: ff2260099ab8669241e3cedd2edd3afe0fb34f4d
Component: engine
2014-02-11 16:23:11 -08:00
deaadc8b56
fix underline/heading
...
Upstream-commit: c76a4e34896fd0785cf982372a3713c4ef70754b
Component: engine
2014-02-11 16:19:42 -08:00
c649008597
Merge pull request #4020 from cameronboehmer/patch-1
...
add vm port forwarding note/example in osx install docs
Upstream-commit: 3122b4b470168ead70a84ff2594aa32c0619e08c
Component: engine
2014-02-11 16:18:54 -08:00
7abeabe543
Merge pull request #4072 from 13W/patch-1
...
Update remote_api_client_libraries.rst
Upstream-commit: 0bcabdbdc79472d7e6c56498c8ae06413730d270
Component: engine
2014-02-11 16:14:22 -08:00
ef486c6630
Move docker version introspection to a sub-package.
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae3c7dec3b075a263da8d1e1cc510275b281e799
Component: engine
2014-02-11 16:10:51 -08:00
27e1a5f0fd
Merge pull request #4035 from SvenDowideit/dont-env-debian-frontend
...
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
Upstream-commit: 9176b6fd883158e3420777e6e2d463ddcf2005ab
Component: engine
2014-02-11 15:59:10 -08:00
231362cb9e
add port forwarding notes for mac/boot2docker docs
...
Docker-DCO-1.1-Signed-off-by: Cameron Boehmer <cameron.boehmer@gmail.com > (github: cameronboehmer)
Upstream-commit: 49b928c0b05852b58881ce8ebdb164db92befd3a
Component: engine
2014-02-11 15:26:12 -08:00
33338e981d
Update remote_api_client_libraries.rst
...
hello, add please my interface
Docker-DCO-1.1-Signed-off-by: Vladimir <xx@ccxx.cc > (github: 13w)
Upstream-commit: d35b03ef8db9d773937133277cc16364a551ab74
Component: engine
2014-02-12 01:09:06 +02:00
b3dbf3da06
Merge pull request #4067 from alexlarsson/fix-devmapper-race
...
Avoid extra mount/unmount during container registration
Upstream-commit: da3e53913388ebc89066bb5de06bcebc2e6c5854
Component: engine
2014-02-11 17:13:33 -05:00
87fd3e0884
Merge pull request #4055 from alexlarsson/remove-devmapper-dirs
...
devmapper: Remove directory when removing devicemapper device
Upstream-commit: a66124ec6aab77ed984896773c9d37b7b343c47f
Component: engine
2014-02-11 17:05:56 -05:00
56af3b233d
Merge pull request #4049 from vieux/fix_commit
...
fix --run in docker commit
Upstream-commit: 2a9a83cf94b6d45604bdf75a5fe4a745960170a9
Component: engine
2014-02-11 22:33:27 +02:00
cc4cc8e5b8
Merge pull request #3990 from 1uptalent/3989-fix-textmate-syntax
...
Fix textmate syntax bundler organization
Upstream-commit: 029a045ef5ead0cf12f8eb62b5208456d21f70b2
Component: engine
2014-02-11 13:16:26 -07:00
750f4cb5c2
Merge pull request #4059 from alexlarsson/no-netadmin-caps
...
lxc: Drop NET_ADMIN capability in non-privileged containers
Upstream-commit: 3c215ba41005f225a07ebc8806216acdb746c671
Component: engine
2014-02-11 14:20:34 -05:00
c19931ad4a
Avoid extra mount/unmount during container registration
...
Runtime.Register() called driver.Get()/Put() in order to read back the
basefs of the container. However, this is not needed, as the basefs
is read during container.Mount() anyway, and basefs is only valid
while mounted (and all current calls satisfy this).
This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036 .
With this change devicemapper is now race-free, and container startup
is slightly faster.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 0c71015dcf788c5342bb9422a447b7f9ad12d43d
Component: engine
2014-02-11 18:02:30 +01:00
a0e7d3fc71
Ensure docker cp stream is closes properly
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 35821ad78f4ad2b20cf839ecc5a73b44c568c5eb
Component: engine
2014-02-11 06:21:53 -08:00
