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

3584 commits

Author SHA1 Message Date
moxiegirl
2bf409d4ef Merge pull request #13366 from moxiegirl/162-release-notes 
Updating with 1.6.2-cs5 notes
 2015-05-20 15:03:27 -07:00
Mary Anthony
7554949da6 Updating with 1.6.2-cs5 notes 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-20 14:39:00 -07:00
Jessie Frazelle
19790c46dc Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
 2015-05-20 13:04:28 -07:00
Arnaud Porterie
ca6722f1c5 Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-20 12:21:17 -07:00
Alexander Morozov
53a795378d Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
 2015-05-20 11:13:56 -07:00
Sven Dowideit
a09dfbcaad Merge pull request #13214 from zoechi/master 
add bwu_docker
 2015-05-20 13:43:16 +10:00
Sven Dowideit
a057accb59 Merge pull request #13315 from SvenDowideit/add-kitematic-docs 
Add Kitematic documentation to docs.master.docker.com
 2015-05-20 12:27:33 +10:00
Sven Dowideit
82bd3886d5 Add Kitematic documentation to docs.master.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-20 01:57:45 +00:00
Doug Davis
7fcf849749 Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-19 11:21:05 -07:00
moxiegirl
6f4b808f41 Merge pull request #13238 from hqhq/hq_fix_usingdocker_md 
Remove wrong usage in usingdocker.md
 2015-05-19 09:24:31 -07:00
Qiang Huang
f46cf73295 Remove wrong usage in usingdocker.md 
Fixes: https://github.com/docker/docker/issues/13235

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-19 13:07:41 +08:00
moxiegirl
6a18412d5b Merge pull request #13189 from alvinr/mongodb-fixup 
Fixup MongoDB changes to line up with MongoDB 3.0 release
 2015-05-18 15:22:41 -07:00
Alvin Richards
3f37afe0b9 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
 2015-05-18 13:08:31 -07:00
Sebastiaan van Stijn
93825056d8 Merge pull request #13206 from draghuram/info_api_doc 
Bring /info API doc in line with the actual response.
 2015-05-18 20:20:57 +02:00
James Turnbull
8f8ee7d5c3 Merge pull request #12804 from ankushagarwal/configuring-docker 
Add CentOS/RHEL configuration to the config article
 2015-05-18 14:18:32 -04:00
Raghuram Devarakonda
9c0608565c Bring /info API doc in line with the actual response. 
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-05-18 13:55:42 -04:00
David Calavera
b785e5091f Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
 2015-05-15 11:16:12 -07:00
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
Victor Vieux
b261ce5fb0 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-14 17:31:45 -07:00
Günter Zöchbauer
ef956253d8 Add bwu_docker to the list. 
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com>
 2015-05-14 15:27:51 +02:00
Ankush Agarwal
9bfe6f0d24 Update Configuring and running Docker article 
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-05-14 07:45:20 +02:00
Sebastiaan van Stijn
1d57642906 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
 2015-05-13 20:23:19 -07:00
Hu Keping
945fc9d882 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-14 18:58:55 +08:00
Sebastiaan van Stijn
ed25742002 Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
 2015-05-13 18:30:32 -07: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
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