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

3559 commits

Author SHA1 Message Date
moxiegirl
32f8a40398 Merge pull request #13193 from moxiegirl/dhe-commercial-release 
adding release note for 1.6.2
 2015-05-13 14:51:50 -07:00
Mary Anthony
6c17b4818d adding release note for 1.6.2 
Signed-off-by: Mary Anthony <mary@docker.com>

ugh, cut n paste

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-13 13:54:30 -07:00
Jessica Frazelle
e096d56713 cleanup test-integration 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-12 15:39:57 -07:00
Jessie Frazelle
5bf2ebf0a5 Merge pull request #13127 from shishir-a412ed/exec_opt_doc 
Missing exec-opt[] option in CommandLine docs
 2015-05-12 11:34:51 -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
Tibor Vass
e7568ed227 Merge pull request #9411 from Mic92/features/zfs-rebased 
zfs-utils based zfs graph driver
 2015-05-11 16:53:17 -07:00
Sven Dowideit
c5e93d0950 Need more sudo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-11 23:07:22 +00:00
Sven Dowideit
38af208da1 DHE 1.0.1 release 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-11 21:23:56 +00: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
Shishir Mahajan
98277f3cad Missing exec-opt[] option in CommandLine docs 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-05-11 15:41:50 -04: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
Gianluca Borello
e324f51e5b Default MAC address generation is not random and should be stated in the documentation. 
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
 2015-05-10 08:11:26 -07: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
Jörg Thalheim
bdf784ae4a docs: move zfs.fsname option to storage option section 
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-05-08 17:48:20 +02:00
Jörg Thalheim
d5151ca8ab Implement Docker on ZFS 
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-05-08 17:48:20 +02:00
Jessie Frazelle
fe3becee34 Merge pull request #12422 from wlan0/logopts 
add log opts flag to pass in logging options
 2015-05-07 18:10:04 -07:00
Jessie Frazelle
128a07b512 Merge pull request #13027 from runcom/fix-typo-reference-remote-api 
Fix typo in the api remote reference for links
 2015-05-07 17:53:21 -07:00
Jessie Frazelle
6b6a26c769 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
 2015-05-07 17:13:32 -07: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
Sven Dowideit
59bfee2fa4 DHE documentation update 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-07 20:38:46 +10: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
Sven Dowideit
9da3a848ab Add a userguide to cover the uses of Hub before creating new repositories 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-07 00:31:04 +00:00
Antonio Murdaca
72a0272a62 Fix typo in the api remote reference for links 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-06 22:08:10 +02:00
moxiegirl
78c70cc364 Merge pull request #13003 from moxiegirl/machine-branch-change 
Updating branch for machine docs
 2015-05-05 14:49:44 -07:00
Arnaud Porterie
e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Mary Anthony
8c9d67921a Updating branch for machine docs 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-05 14:33:31 -07:00
Peter Salvatore
3efc083d4a Remove blanket "supported" language. 
Signed-off-by: Peter Salvatore <peter@psftw.com>
 2015-05-05 11:03:53 -04:00
Lei Jitang
0e08e9aca1 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-05 19:28:40 +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
Sven Dowideit
bba5fd8caa spelling fix from Marc MERLIN 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-05 00:38:41 +00:00
Fred Lifton
77183ed760 Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation 
Update the Docker Hub account, org and group documentation and images
 2015-05-04 16:23:08 -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
wlan0
dca9e02b15 Add log opts flag to pass in logging options 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-05-04 14:39:48 -07:00
David Calavera
0a2ccb1cb5 Merge pull request #12769 from calavera/git_build_fragment 
Use git url fragment to specify build reference and dir context.
 2015-05-04 12:48:24 -07:00
Jessie Frazelle
0c1c272687 Merge pull request #12865 from larsks/bug/12864 
journald log driver: use CONTAINER_ID field for container id
 2015-05-04 10:53:58 -07:00
David Calavera
49fd83a25e Use git url fragment to specify reference and dir context. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-04 09:28:06 -07:00
Sebastiaan van Stijn
ac324e5e52 Merge pull request #11034 from HuKeping/oom_kill_disable 
enable cgroups memory.oom_control
 2015-05-04 11:53:05 -04: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
Sven Dowideit
5cec69a7b3 Update the Docker Hub account, org and group documentation and images 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-04 00:37:54 +00:00
James Turnbull
fe221852b7 Merge pull request #12950 from thieman/tnt-riak-ssh-reference 
Remove stale reference to previous SSH instructions
 2015-05-03 15:42:38 -04:00
Travis Thieman
b40a5eeec8 Remove stale reference to previous SSH instructions 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-05-03 14:15:17 -04:00
Sebastiaan van Stijn
0ad6f90127 Merge pull request #12893 from vdemeester/12892-fix-labels-documentation 
Fixing examples given for labels
 2015-05-02 22:29:08 -04:00
Megan Kostick
5eee4058fe Docs adding uninstall instructions 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-05-01 08:10:56 -07:00
moxiegirl
7e864a57bc Merge pull request #12915 from moxiegirl/implement-github-ignores 
Adding support for GITHUB IGNORES to the engine Dockerfile
 2015-05-01 06:29:27 -07:00
moxiegirl
7e7b6a20bd Merge pull request #12901 from hqhq/hq_fix_test_comment 
fix comments for test certain tests
 2015-04-30 17:08:23 -07:00
Mary Anthony
51977a2307 Adding support for GITHUB IGNORES to the engine Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-30 15:21:05 -07:00
moxiegirl
cacf90c963 Merge pull request #12857 from nikolas/patch-1 
Remove incorrect option in docker install command
 2015-04-30 09:35:20 -07:00