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

267 commits

Author SHA1 Message Date
Shishir Mahajan
8b2c6cb072 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-05-15 09:30:36 -04:00
Darren Shepherd
f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Sebastiaan van Stijn
d0459abe6e Merge pull request #12362 from ahmetalpbalkan/logs/since 
Add --since argument to docker logs cmd
 2015-05-12 09:40:16 -04:00
Jessie Frazelle
8cc93856e3 Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
 2015-05-11 13:18:29 -07:00
Antonio Murdaca
c6e6223ed7 Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-11 21:50:47 +02:00
Ahmet Alp Balkan
cb9a6b9aed Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-10 20:42:14 +00:00
Ma Shimiao
dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
Jessie Frazelle
de32f5c431 Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
 2015-05-07 17:10:39 -07:00
Jessie Frazelle
74bfa36753 Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
 2015-05-07 14:01:16 -07:00
Qiang Huang
f133f11a7d add blkio.weight support 
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-07 11:55:58 +08:00
Tibor Vass
91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Arnaud Porterie
f42348e18f Add --userland-proxy daemon flag 
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-04 16:07:45 -07:00
Brian Goff
f3023a93d1 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-04 10:49:13 -04:00
HuKeping
a4a924e1b6 Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-04 21:11:29 +08:00
Jessie Frazelle
53bef64804 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
 2015-04-29 10:00:41 -07:00
Jessica Frazelle
2afcd10202 option to configure cgroups 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-27 17:50:39 -07:00
Jessica Frazelle
d4bbbe58dd Add docs for --exec-opt and setting native.cgroupdriver. 
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-04-27 17:04:28 -07:00
Zhang Wei
29f379ea6e improve docker man page 
fix issue #12708:
"docker man page is misleading about format of commands"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-04-27 23:27:35 +08:00
Lei Jitang
5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Dan Walsh
b88b2fa72e Merge branch 'master' of github.com:docker/docker into journald 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-22 17:37:26 -04:00
Fred Lifton
21c8d211e1 Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc 
Remove some unsupported instructions in the docs.
 2015-04-21 14:08:31 -07:00
Dan Walsh
364287b741 Add journald as a supported logger for containers 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-21 12:57:54 -04:00
Jessie Frazelle
17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Jessie Frazelle
47b703593e Merge pull request #12430 from icecrime/11551_carry 
Add -H|--human command-line flag to `docker history`
 2015-04-20 17:28:24 -07:00
Lei Jitang
dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Sylvain Baubeau
acb6127c1a Allow specifying a default gateway for bridge networking 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
 2015-04-20 15:13:30 +02:00
Shijiang Wei
49be84842e Remove some unsupported instructions in the docs. 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-04-20 16:48:17 +08:00
Mary Anthony
7b2b7df386 Docker Registry Server > Docker Registry 
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-18 19:19:48 -07:00
Qiang Huang
01548ed1dc update docker-inspect man page 
- sort inspect out
 - update output fields
 - format output
 - add doc about go template
 - other minor fix

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-17 09:25:06 +08:00
Arnaud Porterie
ae5cf30c7c Add -H|--human flag to docker history 
Add a flag to print sizes and dates in human readable format.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-16 08:38:18 -07:00
Qiang Huang
8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
wonderflow
d791f7e9f8 fix memory stats display document 
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-14 18:34:20 +08:00
Michael Crosby
12f7db1830 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
 2015-04-13 13:50:51 -07:00
Michael Crosby
6fa2a1e486 Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
 2015-04-13 13:32:45 -07:00
Eric Windisch
ac65c8c380 HTTPS URLs for docs top-level & man pages 
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-04-11 13:43:26 -04:00
jianbosun
d6d8f45b04 change memory usage display 
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB

Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
 2015-04-11 20:04:34 +08:00
Lei Jitang
72a500e9e5 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:26:37 +08:00
Lei Jitang
2cce4791b0 Add -u|--user flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:04:24 +08:00
Arnaud Porterie
7cec5f50c5 Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword 
cli: Better wording for daemon --log-driver
 2015-04-10 08:29:29 -07:00
Tibor Vass
fa2ace00a8 Rebase + some fixes 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-09 21:29:42 -04:00
David Young
8d682bf734 Refine document by review comments 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:42 -04:00
David Young
bf57339527 Add comment column in docker history command output 
Signed-off-by: David Young <yangboh@cn.ibm.com>
 2015-04-09 21:29:41 -04:00
Ahmet Alp Balkan
a4b7a9e1e5 cli: Better wording for daemon --log-driver 
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.

Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-09 02:12:44 -07:00
Chen Hanxiao
809d99ad91 docs: add missing accent mark around docker command 
As we did everywhere.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-09 04:37:23 -04:00
Mary Anthony
fdfc36db41 Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 13:20:17 -07:00
Arnaud Porterie
ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
moxiegirl
96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
Chen Hanxiao
8fa03df885 docs: keep the style of docker-commit consistent with docker-import 
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-04-02 05:01:14 -04:00
Mary Anthony
b6d55ebcbc Updating with man pages for distribution 
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-01 21:02:19 -07:00
Yuan Sun
a44451d40e Fix typoes in docker-run.1.md 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-01 17:09:01 +08:00