David Calavera
3ee15acaad
Merge pull request #14659 from calavera/promote_volumes_experimental_to_master
...
Promote volume drivers from experimental to master.
2015-07-21 10:39:17 -07:00
David Calavera
c4d45b6a29
Promote volume drivers from experimental to master.
...
Remove volume stubs and use the experimental path as the only path.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-21 09:32:44 -07:00
moxiegirl
1ca737875d
Merge pull request #14725 from charleswhchan/issue-14433
...
Issue #14433
2015-07-21 07:48:54 -07:00
Sebastiaan van Stijn
739f7b1da6
Merge pull request #14731 from Evalle/14729-Fix-ubuntu-doc-issue
...
Fixing ubuntu doc issue
2015-07-21 15:51:11 +02:00
Sebastiaan van Stijn
1e9394103c
Merge pull request #14727 from vdemeester/opts-docs-updates
...
Update documentation according to opts updates (#13694 )
2015-07-21 14:19:29 +02:00
Vincent Demeester
dc8b765930
Update documentation according to opts updates
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-21 14:08:19 +02:00
Sebastiaan van Stijn
197c9010bc
Merge pull request #14766 from runcom/remove-ref-from-libcontainer
...
Remove reference to docker/libcontainer
2015-07-21 12:49:36 +02:00
Sebastiaan van Stijn
f0473eaf01
Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin
...
Add gradle docker remote api plugin
2015-07-21 08:34:08 +02:00
Sebastiaan van Stijn
8b7923620a
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
2015-07-21 00:23:56 +02:00
Fred Lifton
6609cfb5e7
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2015-07-20 11:59:48 -07:00
Antonio Murdaca
691e3a3e70
Remove reference to docker/libcontainer
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-20 20:30:22 +02:00
Qiang Huang
6f8ddec1d0
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-20 16:10:10 +08:00
Mary Anthony
e0bceb7064
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:39:43 -07:00
Arnaud Porterie
ccc78c9968
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
2015-07-19 13:00:50 -07:00
Tobias Gesellchen
a51684ff8f
add gradle-docker-plugin, update docker-client url
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-07-19 21:28:11 +02:00
Tobias Gesellchen
38e7069668
remove unused row-even and row-odd css classes
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-07-19 21:27:12 +02:00
Charles Chan
08d5424c04
Issue #14433
...
Try to improve the cache behavior for `ADD` and `COPY` commands.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-19 12:19:28 -07:00
moxiegirl
32764fe3b9
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
2015-07-19 06:53:25 -07:00
evalle
120c21c97c
Fixing ubuntu doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-07-18 18:24:45 +02:00
Sebastiaan van Stijn
a89370039a
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
2015-07-18 11:14:28 +02:00
Arnaud Porterie
340bd135dd
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-17 14:04:19 -07:00
Sebastiaan van Stijn
415f744d0c
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
2015-07-17 22:41:26 +02:00
Charles Chan
ceca4109fa
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-16 22:49:46 -07:00
Sebastiaan van Stijn
8c77e39627
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
2015-07-16 18:32:56 +02:00
Doug Davis
081991c01e
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-16 08:23:55 -07:00
James Turnbull
b70428c4dd
Merge pull request #14670 from chenchun/fix_fluentd_link
...
Fix fluentd link name
2015-07-16 10:44:54 -04:00
Charles Chan
c4d2b34d13
Split apt-get example onto multiple lines. Use extra spaces to align the code block.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-16 06:42:07 -07:00
Chun Chen
ed23ecd305
Fix fluentd link name
...
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-07-16 14:23:56 +08:00
Charles Chan
f373bd97c3
Trim excess from image. Based on the context, the email itself is sufficient.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-15 20:15:57 -07:00
Anatoly Borodin
5f9d1bc018
Fix a typo: change "such Bash" to "such as Bash"
...
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
2015-07-15 17:10:22 +02:00
Sven Dowideit
174870e64f
Trusted build servers moved to AWS and use an elastic IP
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-07-14 19:20:09 -07:00
Jessica Frazelle
24bb36297c
update urls for rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-14 15:26:11 -07:00
Jessie Frazelle
892ac93ec9
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
2015-07-10 15:21:29 -07:00
Jessie Frazelle
a828415286
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
2015-07-10 15:20:52 -07:00
Sebastiaan van Stijn
5bf98dd997
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
2015-07-10 23:05:49 +02:00
Doug Davis
daced1d303
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-10 12:51:34 -07:00
Nate Brennand
6827782bef
update reference to config file
...
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.
Signed-off-by: Nate Brennand <nate.brennand@clever.com>
2015-07-10 18:55:47 +00:00
moxiegirl
5bf335d0a2
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
2015-07-10 11:15:02 -07:00
moxiegirl
471fbc9b99
Merge pull request #14478 from atilacamurca/patch-1
...
Update run.md
2015-07-10 11:13:51 -07:00
Doug Davis
0bf0e5a6ef
Align 'docker commit' docs with the code
...
It was missing some variants and 'maintainer' isn't actually supported.
Also sorted the list of allowed cmds in the code just to make it easier
to diff with the docs.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-09 13:17:47 -07:00
Sebastiaan van Stijn
ca3e4ccb80
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
2015-07-09 08:23:26 +02:00
Harry Zhang
54ac3ad736
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2015-07-09 02:40:47 +00:00
Victor Vieux
d2cde4fa66
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-07-08 15:42:41 -07:00
James Turnbull
aaf1426995
Merge pull request #14494 from HuKeping/update-docs
...
docs: update docs for API history
2015-07-14 08:16:00 -04:00
Hu Keping
29660f263e
docs: update docs for API history
...
The response of hitory API includes more information now.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-14 19:54:24 +08:00
Qiang Huang
c3b77bbe8b
Docs: fix commandline doc create.md and run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-14 09:26:59 +08:00
Jessie Frazelle
35b0223921
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
2015-07-13 17:08:05 -07:00
Patrick Hemmer
41588a5766
add --format flag to docker version
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
2015-07-13 19:10:56 -04:00
moxiegirl
73bd855dcc
Merge pull request #14581 from vdemeester/14573-docs-docker-bestpractice-fix
...
Fixes TOC in dockerfile_best_practices.md
2015-07-13 15:14:56 -07:00
Vincent Demeester
d03923732f
Fixes TOC in dockerfile_best_practices.md
...
Decided to put the link in a reference word.
Closes #14573
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-13 23:46:04 +02:00