Commit Graph

8281 Commits

Author SHA1 Message Date
399e34e6ec Expand the Advanced Networking page to all options
For issue #5658 this rewrite of the networking page explains what every
single option (unless I missed one!) does both for the Docker server and
also the Docker client when submitting a "docker run".  I somehow
thought that, when I was done, there would be a lot more about setting
up topologies like I did for my Foundations of Python Network
Programming network of Docker containers.  More about making routers and
firewalls that NAT and so forth.  But, at least for this draft, I think
that setting up subnets and setting up point-to-point links is most of
what Docker users will need unless they are doing something exotic.

We can always expand later.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md documentation per @jamtur01

Besides catching some typos and awkward sentences, @jamtur01 had several
more thorough changes to suggest:

 *  He illustrated the correct way to delimit "Note" paragraphs in
     Docker documentation.

 *  He helped point out where I was presuming an Ubuntu host running
    Docker, so that I could re-word those sections to be specific that
    the advice only applied to Ubuntu (these mostly related to how to
    set server-wide options and restart the server).

 *  He is happy to have "Ethernet" capitalized even where Linux
    documentation would render it with an ugly lower-case first letter.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md per ideas from @SvenDowideit

A response to a bit of further discussion of pull request #5884.
Upstream-commit: ca9c35cdf772ddb121447b3877dbcf8caa4c5cdb
Component: engine
2014-05-18 21:58:39 -04:00
a370795c17 Merge pull request #5883 from jamtur01/debianinst
Added basic Debian installation page
Upstream-commit: 3b96078856b935bf634eab0c4c449dce34cfdf7e
Component: engine
2014-05-18 19:02:48 -04:00
dc955f4ca7 Fixed sudo section to match Debian installation doc
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: f8974b5cfc87f7775019e3df2d09ad68f2119772
Component: engine
2014-05-18 18:55:58 -04:00
35afe10f75 Added basic Debian installation page
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 88afc8992f2ebd2fd95d87dfff720ff946183975
Component: engine
2014-05-18 18:55:36 -04:00
c07a6a4297 Merge pull request #5889 from financeCoding/couchdb_doc_nit
removing grep command that depends on perl, better for boot2docker
Upstream-commit: 255eca719326c1db4ea75e7ded5863ed672d9c7c
Component: engine
2014-05-18 23:29:29 +02:00
876c525e4c removing grep command that depends on perl, better for boot2docker
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 7f9178c6d15417ed8b32976b7ca075422c8160da
Component: engine
2014-05-18 10:02:39 -07:00
fc1241ce1d Merge pull request #5882 from jamtur01/ubfix
Fixed description and keywords on Ubuntu installation docs
Upstream-commit: f65db7c565ed736e26fc9daa30b1bc526351e70b
Component: engine
2014-05-18 17:26:29 +01:00
453e10c323 Merge pull request #5886 from financeCoding/mac_doc_nit
command line nit
Upstream-commit: a2dffd72ef87c7d9081633a4bed61a206fb0c326
Component: engine
2014-05-18 17:17:47 +01:00
3103867f6f command line nit
Upstream-commit: 21e36ab36cd0beb192ce95469639f659b4877641
Component: engine
2014-05-17 22:04:41 -07:00
d0caec517c Fixed description and keywords on Ubuntu installation docs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a52db7d8802f3cfd8a88e1bcf0a25f59458f7558
Component: engine
2014-05-17 22:18:08 +02:00
72f6d9b1b0 Merge pull request #5850 from rhatdan/fixmanpage
Add description of --volume read-only/read-write to docker-run man page.
Upstream-commit: 9405a58e99636f7d21e1442b90d3b4a9fdcac5bb
Component: engine
2014-05-17 10:50:18 +02:00
96be0f9c84 Merge pull request #5832 from stevenburgess/documentation_cli_fix
Refactor b.tar -> busybox.tar
Upstream-commit: 4dabca90464f572f5a9ebeae3bdba8e77f6a353b
Component: engine
2014-05-17 09:42:20 +01:00
e1c7159b65 Merge pull request #5863 from vieux/pr5862
Make libcontainer's CapabilitiesMask into a []string (Capabilities). + 	add support for CAP_FOWNER
Upstream-commit: cc84dd09676623961ef8dd2d7a415e10323ef9c3
Component: engine
2014-05-16 18:23:50 -07:00
06d0a8ebde Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer
allow 2 docker events to be opened on the same computer over unix socket
Upstream-commit: 9e7757a3d25947d5ef8f8882baae0bacd6fb1f49
Component: engine
2014-05-16 18:17:46 -07:00
cc28bc2288 add support for CAP_FOWNER
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: a0070f0c17b4f65bdfc5368b93d0fa8636eda03d
Component: engine
2014-05-17 01:16:07 +00:00
e3742d2641 Make libcontainer's CapabilitiesMask into a []string (Capabilities).
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 92614928cecd48b241011e614fa856c4fdbac1f6
Component: engine
2014-05-17 00:44:10 +00:00
0763a3738d Merge pull request #5761 from SvenDowideit/pr_out_tell_the_user_not_to_run_from_osx
tell the user not to run -d from OSX
Upstream-commit: 704e9f9ff0e5af18938085298a0f6f69262d693a
Component: engine
2014-05-16 16:52:08 -07:00
4d36898842 Merge pull request #5851 from proppy/archive-simple-detect
archive: simplify DetectCompression
Upstream-commit: 6f651ec62bdb7b00dc286414c1807a4ae4216058
Component: engine
2014-05-16 16:32:55 -07:00
add055e2b6 Merge pull request #5822 from creack/update_vendors
Update archive/tar vendored
Upstream-commit: eb61a1f73a979cc12e5ec1e6f451ec4dc4e37817
Component: engine
2014-05-16 16:31:37 -07:00
25b0a0131e archive: add missing bytes package
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 4a3aefbb5232433098c9d27423a10031eb17ff93
Component: engine
2014-05-16 16:26:28 -07:00
1976c1713a archive: fix panic if len(source) < len(m)
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 67ce59a806007cd28d96fd11208c4a113d1b92e0
Component: engine
2014-05-16 16:25:56 -07:00
c1c5dca31c archive: simplify DetectCompression
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 3118952e0a63b42b830fc846a56b891d14902976
Component: engine
2014-05-16 16:25:56 -07:00
379b590f9f Merge pull request #4882 from vieux/fix_merge_issue_tty
Fix merge issue tty
Upstream-commit: 58b49e60bbd3d9d978ecf3e96f53b47fdcca8cce
Component: engine
2014-05-16 15:42:43 -07:00
8003cf19d2 do not merge -i or -t options
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
2014-05-16 22:31:16 +00:00
a03989227c add test
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 366f084eb0864db6dcf5cc47e434b3c6f43500d7
Component: engine
2014-05-16 22:23:32 +00:00
ed8430a340 Merge pull request #5571 from vieux/fix_race_docker_daemon
Fix race docker daemon
Upstream-commit: 00ce30bc7473b389579a44e55a01c818ebae84e1
Component: engine
2014-05-16 13:57:43 -07:00
4dfcc75b6e Merge pull request #5853 from proppy/update-tarfilter-comment
archive: update TarFilter comments
Upstream-commit: 1adc2fa533ad86be3ff3e122feaa3d798f130a2e
Component: engine
2014-05-16 13:06:12 -07:00
0eaa2babd7 Merge pull request #5436 from hobofan/master
reapply Cmd value even if CmdAdd returns early
Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f
Component: engine
2014-05-16 12:45:23 -07:00
3f955b3cac archive: update TarFilter comments
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 311614952ea64315075d827c880debbdfb503640
Component: engine
2014-05-16 12:44:42 -07:00
09681d4edc Add description of --volume read-only/read-write to docker-run man page.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 2e0d47e5c4c63323623c38cf0ca8d63efab8b493
Component: engine
2014-05-16 15:06:34 -04:00
538811ef9a Merge pull request #5833 from ActiveState/fix_nsinit_env_panic
fix panic when passing empty environment
Upstream-commit: 62c3183fc88779479905df8c2f7561c46a08d2ee
Component: engine
2014-05-16 12:03:26 -07:00
919aaa7d95 fix panic when passing empty environment
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
Upstream-commit: d787f2731e4242f244e88f047032ad9650f1f8d7
Component: engine
2014-05-16 11:55:34 -07:00
25e8afd42a Merge pull request #5810 from vmarmol/drop-caps
Change libcontainer to drop all capabilities by default.
Upstream-commit: 01d10d6f13d62d74f850fea2a685b24b7983244e
Component: engine
2014-05-16 11:51:41 -07:00
44fdfa90b2 Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
5370 infinite loop caused by symlink
Upstream-commit: 23062e55fd0eb75f28ff74e3de46bc3e15b0280f
Component: engine
2014-05-16 11:28:37 -07:00
c2681da5e2 Merge pull request #5841 from unclejack/run_pull_latest
run: pull only latest when no tag specified
Upstream-commit: 808d28033b981188a3856098e9e3d6b96a9b9a53
Component: engine
2014-05-16 11:21:29 -07:00
1bc76e2712 Merge pull request #5842 from alexlarsson/dm-cleanup-tests
devicemapper: Remove non-general tests
Upstream-commit: dbd6f10b3d1aa4b2e85e3a2536a5fd4b754c1deb
Component: engine
2014-05-16 11:08:04 -07:00
4549210429 Merge pull request #5837 from proppy/patch-2
server/buildfile: correct daemon.Create comments
Upstream-commit: 2b3b03b596a773fed0527a4617deb834ecd000e8
Component: engine
2014-05-16 10:51:09 -07:00
c6f81b2d5f server/buildfile: correct daemon.Create comments
s/and start it//

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 8b31824ad6118ed505b43443816c1492e3d81c8c
Component: engine
2014-05-16 10:50:02 -07:00
990bb5ea3a Merge pull request #5838 from timthelion/patch-1
Typo in execdrivers.go five => give
Upstream-commit: 021ac36a70048074e752988a7a8789c02c701b17
Component: engine
2014-05-16 10:49:44 -07:00
f1c91438e8 Merge pull request #5840 from unclejack/upstart_mounted
Update contrib/init/upstart to "start on local-filesystems"
Upstream-commit: 6dd4fa0b74fac2abf5ebf03c1cc89d5d7d03da1b
Component: engine
2014-05-16 10:16:34 -06:00
cdfe67b94e contrib/init/upstart: start on local-filesystems
This changes the upstart init script to start on `local-filesystems`.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ba0c8292917560b45f840f187c2a8f452550705d
Component: engine
2014-05-16 19:12:59 +03:00
3e603cbd49 run: pull only latest when no tag specified
This makes Docker pull only the image tagged as latest when no tag has
been specified. This makes Docker pull only the image it'll run.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: b8e338144e90a6bb76110ab04cc216966640a3f4
Component: engine
2014-05-16 15:23:47 +03:00
e3a28edbe2 devmapper: Remove sys.go mocking framework
This is no longer needed, as the tests are gone.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 39d244a593aad63be58d8b2e452715e25135f255
Component: engine
2014-05-16 14:12:56 +02:00
2ef3480938 Typo in execdrivers.go five => give
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
Upstream-commit: 408f050d648da0b64d353146a1be59827d76bf70
Component: engine
2014-05-16 11:45:20 +00:00
de83ad1721 Merge pull request #5828 from SvenDowideit/pr_out_update_the_cli_md_docs_with_the_output_of_the_docker_command
Update the cli.md docs with the output of the docker command
Upstream-commit: c4fc591fbe5cdc7a3b02fe1cfa293d57ce020565
Component: engine
2014-05-16 12:10:55 +01:00
130a91328f devicemapper: Remove non-general tests
Now that we have the generic graphtest tests that actually tests
the driver we can remove the old mock-using tests. Almost all of
these tests were disabled anyway, and the four remaining ones
didn't really test much while at the same time being really
fragile and making the rest of the code more complex due to
the mocking setup.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bd6fd25dfb4cf7aae0e5e382e3bf10c9b2caa5fb
Component: engine
2014-05-16 12:46:28 +02:00
811e26ec97 Refactor b.tar -> busybox.tar
The file was saved as busybox.tar, but the ls commands named it b.tar.

Docker-DCO-1.1-Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com> (github: stevenburgess)
Upstream-commit: ddb99054bc9c04cce4ca761f9f0d822d67d614c4
Component: engine
2014-05-15 22:33:28 -04:00
48bd5989f0 Change libcontainer to drop all capabilities by default. Only keeps
those that were specified in the config. This commit also explicitly
adds a set of capabilities that we were silently not dropping and were
assumed by the tests.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 9d6875d19d3926faf6287487234ad0b2f1310e9d
Component: engine
2014-05-16 00:57:58 +00:00
e41b5598f3 Merge pull request #5497 from alexlarsson/generic-driver-tests
graphdriver: Add generic test framework for graph drivers
Upstream-commit: 08a7bcf5dbb093900ddfd1f300a8bbd97bced507
Component: engine
2014-05-15 17:21:09 -07:00
e6ed9607f5 Merge pull request #5454 from kzys/utime-omit
UTIME_OMIT is only available on Linux
Upstream-commit: 4353ee78e8614779012b2f24d79a46fa352739b8
Component: engine
2014-05-15 17:18:37 -07:00