Commit Graph

7697 Commits

Author SHA1 Message Date
beaedbfd4c Change single-dash flag usage to double-dash
The single-dash long-form flag usage is deprecated.

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com> (github: nathanleclaire)
Upstream-commit: e7babb28ccb2d451baec9a8cb83e627390cbcdd4
Component: engine
2014-05-21 17:07:04 -07:00
ae6d266785 Merge pull request #5930 from alexlarsson/add-cap-setfcap
native driver: Don't drop SETFCAP
Upstream-commit: e5202de9186a2548c54af54739a6cb09046afd61
Component: engine
2014-05-20 10:29:37 -07:00
2c2ee20fef Merge pull request #5929 from alexlarsson/systemd-cgroup-allow-mknod
cgroups: Allow mknod for any device in systemd cgroup backend
Upstream-commit: f3edb7c0e8197d1573ec3bfa058ed498ebeca2e7
Component: engine
2014-05-20 10:13:13 -07:00
91009e208d Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
Wait for pidfile to exist when starting with RedHat init script
Upstream-commit: 47aa9f5a0e38f395cee7517720f8a80587bb911b
Component: engine
2014-05-20 10:25:03 -06:00
da7177cbfd native driver: Add required capabilities
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928

We also need SETPCAP, for instance systemd needs this to set caps
on its childen.

Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.

We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fcf2e9a9107c6c9aebaf63ce044f636333e7eed8
Component: engine
2014-05-20 11:31:39 +02:00
d043d726b2 cgroups: Allow mknod for any device in systemd cgroup backend
Without this any container startup fails:
2014/05/20 09:20:36 setup mount namespace copy additional dev nodes mknod fuse operation not permitted

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 602950435056baa939f428223b6d3ff26ca5403d
Component: engine
2014-05-20 09:29:32 +02:00
457c223488 Merge pull request #5920 from jmccrohan/master
docs: cli.md; document docker version output
Upstream-commit: bfe72c6189e92d9ee6f2d2f26a5553b4eb863a44
Component: engine
2014-05-19 21:41:05 -07:00
7428c89c95 docs: cli.md; document docker version output
Commit 3cec63d56f9de6332aa3f33502695283d4feb054 changed the output of
docker version. Updating docs accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 4052a81830e57c9f1d7d567ba9e53813945c9810
Component: engine
2014-05-20 02:00:31 +01:00
77c39f7b85 Merge pull request #5905 from jamtur01/faq
Adding the FAQ back
Upstream-commit: 5511be75127b84933d0f283b21dbd05a1b6edc33
Component: engine
2014-05-20 10:17:01 +10:00
4d767cc66f Merge pull request #5890 from LK4D4/fix_tee_hanging_on_test_fails_#5672
Fix hanging on tests failing
Upstream-commit: 05c3325a02bf2ffee660dcfd36e8d34cb7192b51
Component: engine
2014-05-19 16:37:19 -06:00
cd508fe398 Merge pull request #5915 from vieux/start_remove_link
starts by removing the name from the graph db
Upstream-commit: b5d0bdc9e8f651848b1be2347cedc894dd470e64
Component: engine
2014-05-19 14:38:55 -07:00
062e6435f7 Merge pull request #5913 from crosbymichael/fuse
Make sure dev/fuse is created in container
Upstream-commit: 2d1c2456313d66f3f0ac42d4dc2d307c0fc457c3
Component: engine
2014-05-19 14:31:32 -07:00
27fffbebb6 starts by removing the name from the graph db
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c12dd770908acc06ab402840ad7736e0c056b567
Component: engine
2014-05-19 21:22:33 +00:00
bf729dca8b add unprivilegeduser via the Dockerfile
This changes the test TestBuildWithInaccessibleFilesInContext to not
add the user 'unprivilegeduser' and add it via the Dockerfile instead.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 599cb12bb8aa13aa2f1be940dd8de4c9d3a06959
Component: engine
2014-05-19 23:55:28 +03:00
9b9e25f1db Make sure dev/fuse is created in container
Fixes #5849

If the host system does not have fuse enabled in the kernel config we
will ignore the is not exist errors when trying to copy the device node
from the host system into the container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a87bcefb8bf0cee47bf114a46fc33708ce843208
Component: engine
2014-05-19 20:46:59 +00:00
25d692e3fa Merge pull request #5911 from LK4D4/chmod_on_add_#3979
Make chmod on ADDed files
Upstream-commit: 5fee3774d4c68fa6ec1e330575b1f6edfb71dc6f
Component: engine
2014-05-19 13:35:55 -07:00
20387c224e Make chmod on ADDed files
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 620c8c72535670e8358cebc65a2fb424be58a93c
Component: engine
2014-05-20 00:09:39 +04:00
4bebb62399 Merge pull request #5903 from alexlarsson/writable-proc
Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
Upstream-commit: 30bd2bbc83b746a1d4527a5c57363bcb9bab34d6
Component: engine
2014-05-19 12:21:15 -07:00
494e36141b Merge pull request #5861 from crquan/fix-user-agent-trailing-space
Remove Trailing Whitespace in User-Agent
Upstream-commit: d74b6095c9ca8b51e5ea8edcfba4ab03dad86f05
Component: engine
2014-05-19 12:08:53 -07:00
14c75e39a9 Merge pull request #5869 from vbatts/vbatts-vendor-capabilities
gocapability: upstream fix for unsporrted caps
Upstream-commit: b2275ee8dfe6fae888878a989efe6312b2a4f6a2
Component: engine
2014-05-19 12:08:12 -07:00
c117ccdc5a Make /proc writable, but not /proc/sys and /proc/sysrq-trigger
Some applications want to write to /proc. For instance:

docker run -it centos groupadd foo

Gives: groupadd: failure while writing changes to /etc/group

And strace reveals why:

open("/proc/self/task/13/attr/fscreate", O_RDWR) = -1 EROFS (Read-only file system)

I've looked at what other systems do, and systemd-nspawn makes /proc read-write
and /proc/sys readonly, while lxc allows "proc:mixed" which does the same,
plus it makes /proc/sysrq-trigger also readonly.

The later seems like a prudent idea, so we follows lxc proc:mixed.
Additionally we make /proc/irq and /proc/bus, as these seem to let
you control various hardware things.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 68493e2f7f9cb8303302e1098e3293b521ace243
Component: engine
2014-05-19 20:46:05 +02:00
7c9fae616c Merge pull request #5879 from timthelion/docs-sysinit-readme
Add README.md file for sysinit directory
Upstream-commit: ccf29f0b94274e7052c24a2fc0e0ffc2263a743b
Component: engine
2014-05-19 11:26:22 -07:00
500aeb9329 Merge pull request #5875 from timthelion/docs-archive-readme
Add readme file for the archive directory
Upstream-commit: 7fb5ce44a08a7b41bb641ee89e0baea325d9597a
Component: engine
2014-05-19 11:25:55 -07:00
adb5b13fc3 Merge pull request #5792 from bernerdschaefer/nsinit-supports-pdeathsig
Add PDEATHSIG support to nsinit library
Upstream-commit: cb7680b9b919fdc845a857fafc52178c656cf5be
Component: engine
2014-05-19 11:13:23 -07:00
854833443c Merge pull request #5871 from unclejack/speed_up_buildsixtysteps
integcli: speed up TestBuildSixtySteps
Upstream-commit: 8674ec7f757807a8df6b9980aa62c18499c39d9f
Component: engine
2014-05-19 11:02:36 -07:00
15e0b23213 Merge pull request #5876 from timthelion/docs-daemon-readme
Add readme for daemon directory
Upstream-commit: 40c8fc668c5e8aa4d74d6fa3c7c27a22cd45438c
Component: engine
2014-05-19 10:51:17 -07:00
81325c1851 Merge pull request #5877 from timthelion/docs-daemon-config-readme
Add readme for the daemonconfig directory
Upstream-commit: 5690e0355399f25addc6d8561222e1e7c23e9122
Component: engine
2014-05-19 10:50:51 -07:00
44cdecc9bf Merge pull request #5874 from timthelion/docs-api-readme
Add readme file for the api directory
Upstream-commit: 3fa96c55e3e57fa6a76581bcefa63a4da1a4f2cb
Component: engine
2014-05-19 10:50:00 -07:00
f45c8a5e25 Merge pull request #5782 from unclejack/fix_5270
Upstream-commit: 8eef1be29e763db58a22d336b71d97c076a11199
Component: engine
2014-05-19 10:36:10 -07:00
6d2d044bd5 Merge pull request #5670 from jmccrohan/master
client: Remove docker new version check 
Upstream-commit: b50c9a185c2278daea5be5a9012cf20d548150a4
Component: engine
2014-05-19 10:26:58 -07:00
6d8b321053 Merge pull request #5864 from shykes/pr_out_make_cristian_maintainer_of_integration_cli_he_wrote_it
Make Cristian maintainer of integration-cli (he wrote it)
Upstream-commit: 15a94fdcbb1ff1a6cf5f02248eb7ca92e6bf9ee9
Component: engine
2014-05-19 10:26:18 -07:00
383cab0f3d Merge pull request #5907 from vmarmol/caps
Don't drop CAP_FOWNER in the container.
Upstream-commit: a3a26cd349cc5f2776195e50c8857cd13dc15e22
Component: engine
2014-05-19 10:06:29 -07:00
1bd174defc Merge pull request #5865 from crosbymichael/add-all-caps
Add the rest of the caps so that they are retained in privilged mode
Upstream-commit: 265de539ff4a6fc54c5bf72c8c67d00a533d7f55
Component: engine
2014-05-19 09:56:55 -07:00
5b3405364b Merge pull request #5880 from LK4D4/fix_uid_overflow_#5647
Check uid ranges
Upstream-commit: 66e7cf24b754b9de441669c50b37801706c0a557
Component: engine
2014-05-19 09:55:36 -07:00
4feffb64a0 Don't drop CAP_FOWNER in the container. Also sorts the list of allowed
capabilities.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 0abad3ae2290a2b051b8fdaceab17a1ee41ecfb9
Component: engine
2014-05-19 16:52:39 +00:00
f3abdf9b7d Add the rest of the caps so that they are retained in privilged mode
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e1c7abe8905d4cc034f1ed49e9d102846e412424
Component: engine
2014-05-19 16:43:31 +00:00
85d37676ba Adding the FAQ back
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 702442b58696b1a77d9274c92000f6e0c0c983bb
Component: engine
2014-05-19 10:07:57 -04:00
5fad0a836d Merge pull request #5884 from brandon-rhodes/master
Expand the Advanced Networking page to all options
Upstream-commit: e5422e212f7929207b5df891b3358995755b0e80
Component: engine
2014-05-19 03:35:48 -04:00
059730a575 Merge pull request #5834 from waitingkuo/patch-1
Update ubuntulinux.md
Upstream-commit: 59e37784ee3c2235b0e5919b5dca8f3c2a4c0b66
Component: engine
2014-05-19 03:34:14 -04:00
91b861a49c Fix hanging on tests failing
Tee hanging when `go test` exit with non-zero code.
Fixes #5672
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7cd1e482309e944522d3506f8e15eeb3ab7fb796
Component: engine
2014-05-19 08:26:05 +04:00
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
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
823bf4bfec Check uid ranges
Fixes #5647
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 72d1e40c4a3b190319cfa5cb44b5e6f1694100fc
Component: engine
2014-05-18 20:49:08 +04: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
3103867f6f command line nit
Upstream-commit: 21e36ab36cd0beb192ce95469639f659b4877641
Component: engine
2014-05-17 22:04:41 -07:00
95b5064ed6 client: Rip out HTTP check from docker version
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 3cec63d56f9de6332aa3f33502695283d4feb054
Component: engine
2014-05-18 02:22:22 +01:00
32ad2ac698 client: rearrange docker version output
Rearrange docker version output so that server output matches client
output

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 82712ed67ef9c189ccc8837ef8469272c91f6fcf
Component: engine
2014-05-18 01:49:58 +01:00