e5422e212f
Merge pull request #5884 from brandon-rhodes/master
...
Expand the Advanced Networking page to all options
2014-05-19 03:35:48 -04:00
59e37784ee
Merge pull request #5834 from waitingkuo/patch-1
...
Update ubuntulinux.md
2014-05-19 03:34:14 -04:00
ca9c35cdf7
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 .
2014-05-18 21:58:39 -04:00
3b96078856
Merge pull request #5883 from jamtur01/debianinst
...
Added basic Debian installation page
2014-05-18 19:02:48 -04:00
f8974b5cfc
Fixed sudo section to match Debian installation doc
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-18 18:55:58 -04:00
88afc8992f
Added basic Debian installation page
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-18 18:55:36 -04:00
255eca7193
Merge pull request #5889 from financeCoding/couchdb_doc_nit
...
removing grep command that depends on perl, better for boot2docker
2014-05-18 23:29:29 +02:00
7f9178c6d1
removing grep command that depends on perl, better for boot2docker
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
2014-05-18 10:02:39 -07:00
f65db7c565
Merge pull request #5882 from jamtur01/ubfix
...
Fixed description and keywords on Ubuntu installation docs
2014-05-18 17:26:29 +01:00
a2dffd72ef
Merge pull request #5886 from financeCoding/mac_doc_nit
...
command line nit
2014-05-18 17:17:47 +01:00
21e36ab36c
command line nit
2014-05-17 22:04:41 -07:00
a52db7d880
Fixed description and keywords on Ubuntu installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-17 22:18:08 +02:00
9405a58e99
Merge pull request #5850 from rhatdan/fixmanpage
...
Add description of --volume read-only/read-write to docker-run man page.
2014-05-17 10:50:18 +02:00
4dabca9046
Merge pull request #5832 from stevenburgess/documentation_cli_fix
...
Refactor b.tar -> busybox.tar
2014-05-17 09:42:20 +01:00
cc84dd0967
Merge pull request #5863 from vieux/pr5862
...
Make libcontainer's CapabilitiesMask into a []string (Capabilities). + add support for CAP_FOWNER
2014-05-16 18:23:50 -07:00
9e7757a3d2
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
2014-05-16 18:17:46 -07:00
a0070f0c17
add support for CAP_FOWNER
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-17 01:16:07 +00:00
92614928ce
Make libcontainer's CapabilitiesMask into a []string (Capabilities).
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-05-17 00:44:10 +00:00
704e9f9ff0
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
2014-05-16 16:52:08 -07:00
6f651ec62b
Merge pull request #5851 from proppy/archive-simple-detect
...
archive: simplify DetectCompression
2014-05-16 16:32:55 -07:00
eb61a1f73a
Merge pull request #5822 from creack/update_vendors
...
Update archive/tar vendored
2014-05-16 16:31:37 -07:00
4a3aefbb52
archive: add missing bytes package
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:26:28 -07:00
67ce59a806
archive: fix panic if len(source) < len(m)
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:25:56 -07:00
3118952e0a
archive: simplify DetectCompression
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 16:25:56 -07:00
58b49e60bb
Merge pull request #4882 from vieux/fix_merge_issue_tty
...
Fix merge issue tty
2014-05-16 15:42:43 -07:00
2c8b63cb75
do not merge -i or -t options
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-05-16 22:31:16 +00:00
366f084eb0
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-05-16 22:23:32 +00:00
00ce30bc74
Merge pull request #5571 from vieux/fix_race_docker_daemon
...
Fix race docker daemon
2014-05-16 13:57:43 -07:00
1adc2fa533
Merge pull request #5853 from proppy/update-tarfilter-comment
...
archive: update TarFilter comments
2014-05-16 13:06:12 -07:00
4b587ac118
Merge pull request #5436 from hobofan/master
...
reapply Cmd value even if CmdAdd returns early
2014-05-16 12:45:23 -07:00
311614952e
archive: update TarFilter comments
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 12:44:42 -07:00
2e0d47e5c4
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)
2014-05-16 15:06:34 -04:00
62c3183fc8
Merge pull request #5833 from ActiveState/fix_nsinit_env_panic
...
fix panic when passing empty environment
2014-05-16 12:03:26 -07:00
d787f2731e
fix panic when passing empty environment
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name> (github: srid)
2014-05-16 11:55:34 -07:00
01d10d6f13
Merge pull request #5810 from vmarmol/drop-caps
...
Change libcontainer to drop all capabilities by default.
2014-05-16 11:51:41 -07:00
23062e55fd
Merge pull request #5396 from lalyos/5370-infinite-loop-caused-by-symlink
...
5370 infinite loop caused by symlink
2014-05-16 11:28:37 -07:00
808d28033b
Merge pull request #5841 from unclejack/run_pull_latest
...
run: pull only latest when no tag specified
2014-05-16 11:21:29 -07:00
dbd6f10b3d
Merge pull request #5842 from alexlarsson/dm-cleanup-tests
...
devicemapper: Remove non-general tests
2014-05-16 11:08:04 -07:00
2b3b03b596
Merge pull request #5837 from proppy/patch-2
...
server/buildfile: correct daemon.Create comments
2014-05-16 10:51:09 -07:00
8b31824ad6
server/buildfile: correct daemon.Create comments
...
s/and start it//
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-05-16 10:50:02 -07:00
021ac36a70
Merge pull request #5838 from timthelion/patch-1
...
Typo in execdrivers.go five => give
2014-05-16 10:49:44 -07:00
6dd4fa0b74
Merge pull request #5840 from unclejack/upstart_mounted
...
Update contrib/init/upstart to "start on local-filesystems"
2014-05-16 10:16:34 -06:00
ba0c829291
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)
2014-05-16 19:12:59 +03:00
b8e338144e
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)
2014-05-16 15:23:47 +03:00
39d244a593
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)
2014-05-16 14:12:56 +02:00
408f050d64
Typo in execdrivers.go five => give
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: timthelion)
2014-05-16 11:45:20 +00:00
c4fc591fbe
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
2014-05-16 12:10:55 +01:00
bd6fd25dfb
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)
2014-05-16 12:46:28 +02:00
1b4915c1a8
Update ubuntulinux.md
...
In Ubuntu 14.04, we should use
$ sudo service docker.io restart
instead of
$ sudo service docker restart
2014-05-16 17:08:05 +08:00
ddb99054bc
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)
2014-05-15 22:33:28 -04:00
James Turnbull