beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22555 commits 14 branches 412 tags 338 MiB
Commit graph

4903 commits

Author SHA1 Message Date
Vincent Demeester
20a038eca6 Merge pull request #20604 from coolljt0725/fix_reload 
Fix configuration reloading
 2016-02-29 07:14:15 +01:00
Pavel Sutyrin
30c2770a73 fixed formatting; added handy -y to apt-get install 
Signed-off-by: Pavel Sutyrin <pavel.sutyrin@gmail.com>
 2016-02-28 20:37:04 +03:00
Sebastiaan van Stijn
9792308b84 Merge pull request #20515 from raesene/patch-1 
Update security.md with basic User Namespace info.
 2016-02-26 14:02:46 +01:00
Sebastiaan van Stijn
1ca064cb62 remove leftover Ubuntu 15.04 from install docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-26 13:00:27 +01:00
Vincent Demeester
61d24e769d Merge pull request #20572 from runcom/sudo-user 
resolve the config file from the sudo user
 2016-02-25 16:05:25 +01:00
Vincent Bernat
db5ded0dfc docs: simplify some steps of the overlay network guide 
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2016-02-25 13:17:26 +01:00
Cameron Spear
cc085be7cc Add the Local Persist plugin 
I wasn't 100% sure if it was appropriate to add plugin here, but @thaJeztah invited me to do so, so here it is!

(see https://github.com/CWSpear/local-persist/issues/17#issuecomment-188523784)

Signed-off-by: Cameron Spear <cameronspear@gmail.com>
 2016-02-24 23:29:58 -08:00
Lei Jitang
b9366c9609 Fix configuration reloading 
There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts'
and 'cluster-advertise' that can be reconfigured, configure any of these
options should not affect other options which may have configured in flags.
But this is not true, for example, I start a daemon with -D to enable the
debugging, and after a while, I want reconfigure the 'label', so I add a file
'/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon
to reconfigure the daemon, it work, but the debugging of the daemon is also diabled.
I don't think this is a expeted behaviour.
This patch also have some minor refactor of reconfiguration of cluster-advertiser.
Enable user to reconfigure cluster-advertiser without cluster-store in config file
since cluster-store could also be already set in flag, and we only want to reconfigure
the cluster-advertiser.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-02-24 21:12:14 -05:00
Tomasz Kopczynski
1ed84770c5 Docs: add note about CMD and ENTRYPOINT commands 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-02-24 22:57:25 +01:00
Rory McCune
c1e53ad1aa Update security.md with basic User Namespace info. 
Just some suggested wording to update this page to take account of User Namespaces being available as of 1.10.

Signed-off-by: Rory McCune <rorym@mccune.org.uk>
 2016-02-24 20:53:00 +00:00
Antonio Murdaca
eb902ef257 docs: reference: commandline: daemon: fedora 23+ has mapping files 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:43:28 +01:00
Antonio Murdaca
afde6450ee resolve the config file from the sudo user 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:41:00 +01:00
Sebastiaan van Stijn
034a1a8dfd Merge pull request #20017 from calavera/expose_volumes_in_ps 
Add mounts to docker ps.
 2016-02-24 11:08:21 +01:00
David Calavera
2ed1806b2c Merge pull request #20610 from justechn/fix_docs 
Fix docs
 2016-02-23 13:45:29 -08:00
Ryan McLaughlin
d14cef441d fixing the path of the key pair 
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
 2016-02-23 11:32:28 -07:00
David Calavera
bd4fb00fb6 Add mounts to docker ps. 
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-23 12:10:24 -05:00
Vincent Demeester
20fc13b56d Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup 
Update docs for enableipv6
 2016-02-23 17:57:58 +01:00
David Calavera
9d882cbb44 Merge pull request #20581 from stweil/master 
Fix some typos in comments and strings
 2016-02-23 08:20:53 -08:00
David Calavera
1e02a0810e Merge pull request #20590 from HackToday/fixdoc 
Fix doc format issue
 2016-02-23 08:20:03 -08:00
Aidan Hobson Sayers
82d486848d Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-23 16:10:54 +00:00
Vincent Demeester
783d6c64cf Merge pull request #20500 from ZJUshuaizhou/master 
Update docker_remote_api_v1.22.md
 2016-02-23 14:54:01 +01:00
ZJUshuaizhou
220a188ae8 update all the versions from v1.19 to v1.23 
update v1.22

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update all the versions docs

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>
 2016-02-23 14:34:27 +08:00
Kai Qiang Wu(Kennan)
4d4d1e7f82 Fix doc format issue 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-23 03:42:10 +00:00
Brian Goff
0d808683a1 Merge pull request #20588 from WeiZhang555/typo 
Fix typo
 2016-02-22 21:30:01 -05:00
Zhang Wei
2264bd95b6 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-02-23 10:25:24 +08:00
Stefan Weil
2eee613326 Fix some typos in comments and strings 
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-22 20:27:15 +01:00
hsinko
5642cdeac5 Update docker_remote_api_v1.22.md and v1.23 to complete the docs 
Signed-off-by: hsinko <21551195@zju.edu.cn>

id in example request should be a exact value

Signed-off-by: hsinko <21551195@zju.edu.cn>

revert v1.22 doc

Signed-off-by: hsinko <21551195@zju.edu.cn>

fix tiny errors

Signed-off-by: hsinko <21551195@zju.edu.cn>
 2016-02-22 20:49:10 +08:00
Vincent Demeester
1b811a8930 Merge pull request #20541 from tracylihui/20536-fix 
Update docker_remote_api_v1.21.md to complete the docs
 2016-02-21 09:27:50 +01:00
tracylihui
cc2ff8c921 Update docs/reference/api to complete the docs 
Signed-off-by: tracylihui <793912329@qq.com>
 2016-02-21 10:28:07 +08:00
Vincent Demeester
3646b14ecd Merge pull request #20528 from cloojure/patch-3 
Update dockernetworks.md
 2016-02-20 23:25:51 +01:00
Vincent Demeester
41a2bac7cf Merge pull request #20542 from longliqiang88/master2.201 
Update doc docker_remote_api_v1.20.md
 2016-02-20 19:18:28 +01:00
longliqiang88
47e3ea7dd1 Update doc docker_remote_api_v1.20.md 
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com>
 2016-02-20 19:32:20 +08:00
tracylihui
df3ede95eb Update docker_remote_api_v1.21.md to complete the docs 
Signed-off-by: tracylihui <793912329@qq.com>
 2016-02-20 19:17:19 +08:00
Sebastiaan van Stijn
dc0a69cbcd Merge pull request #20535 from hsinko/dev 
A wrong word
 2016-02-20 11:57:29 +01:00
Zhang Wei
ff3ea4c90f Update RestartPolicy of container 
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-02-20 17:06:32 +08:00
hsinko
0b64280195 Update configure-dns.md 
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
 2016-02-20 11:51:59 +08:00
Alan Thompson
549fa67dae Update dockernetworks.md 
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-02-19 16:57:13 -08:00
Vincent Demeester
06af9471f8 Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs 
Fix some flaws in docs
 2016-02-19 17:07:50 +01:00
Wen Cheng Ma
f03050cc4c Fix typo error of dockernetworks.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-02-19 17:18:52 +08:00
Arnaud Porterie
117a982d2e Merge pull request #20419 from aboch/cr 
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
 2016-02-18 17:39:46 -08:00
Jian Zhang
cdc7f26715 Fix some flaws in docs 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 2016-02-19 09:27:03 +08:00
Alessandro Boch
ed364b69df Invoke ReloadConfiguration on network controller 
- It reverts fa163f5619 plus a small change
  in order to allow passing the global scope datastore
  to libnetwork after damon boot.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-18 12:14:14 -08:00
ozlerhakan
910ea8adf6 add a section to each volume page 
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com>
 2016-02-18 21:52:15 +02:00
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
Sebastiaan van Stijn
84d2d6acdd Merge pull request #20438 from YeZhenan/nodejs_web_app-update 
update the dockfile of dockerizing a Node.js app.
 2016-02-18 19:17:59 +01:00
Sebastiaan van Stijn
1f97f2232d Merge pull request #20415 from thaJeztah/improve-seccomp-warning 
Be more explicit on seccomp availability
 2016-02-18 15:18:36 +01:00
Zhenan Ye
883b0567f2 update the file of dockerizing a Node.js app. 
Signed-off-by: Zhenan Ye <21551168@zju.edu.cn>
 2016-02-18 06:12:11 -08:00
Sebastiaan van Stijn
13839a6d32 Be more explicit on seccomp availability 
Seccomp is only *compiled* in binaries built for
distros that ship with seccomp 2.2.1 or higher,
and in the static binaries.

The static binaries are not really useful for
RHEL and CentOS, because devicemapper does
not work properly with the static binaries,
so static binaries is only an option for Ubuntu
and Debian.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-18 14:57:47 +01:00
Sebastiaan van Stijn
a9c73b1a7e Merge pull request #20425 from HackToday/fixindex 
Fix wrong index marking
 2016-02-18 14:49:15 +01:00
Kai Qiang Wu(Kennan)
0b4e0ce7cd Fix wrong index marking 
The index was wrong set in docs, so let's fix it

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-02-18 03:08:21 +00:00