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

3958 commits

Author SHA1 Message Date
Erik Bray
12c85f3671 Update windows.md 
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).

Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com>
 2015-07-07 13:51:17 -04:00
moxiegirl
833cdd28ed Merge pull request #14307 from kolyshkin/readme-fixes 
README.md: fix cgroups/namespaces name and link
 2015-07-07 06:09:20 -07:00
zmarouf
3bee3a2927 fix(docs): Small typoes in the Supported installation page 
-> https://docs.docker.com/installation/

Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com>
 2015-07-07 11:09:12 +02:00
Sebastiaan van Stijn
270d7e1af8 Merge pull request #14406 from duglin/tweakCmdlineHelp 
Fix example in cmdline help text to have correct output
 2015-07-07 09:26:13 +02:00
Sebastiaan van Stijn
244141a8aa Merge pull request #13987 from larsks/bug/7583 
Update docker commit man page re: volumes
 2015-07-07 09:16:54 +02:00
Sebastiaan van Stijn
81964ca555 Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats 
Add Docker stats to runtime metrics article
 2015-07-07 08:21:31 +02:00
Sebastiaan van Stijn
a25ee91f1c Merge pull request #14095 from timwraight/master 
Clarify .dockerignore example for Markdown files
 2015-07-07 07:59:39 +02:00
Kir Kolyshkin
68efb27e99 daemon.md: fix placement of exec driver heading 
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-06 22:51:31 -07:00
Doug Davis
aea0fd0115 Fix example in cmdline help text to have correct output 
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 17:51:09 -07:00
moxiegirl
6ffce0131c Merge pull request #14154 from chrismckinnel/master 
Fix a broken link to .dockerignore
 2015-07-06 15:48:25 -07:00
Ankush Agarwal
274c838ced Add Docker stats to runtime metrics article 
Fixes #13170

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-06 15:40:26 -07:00
Doug Davis
4bb3c253e8 Add some missing events to the API docs 
Closes #14407

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 11:39:37 -07:00
Lars Kellogg-Stedman
a974789537 Update docker commit man page re: volumes 
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-07-06 10:16:21 -04:00
Mary Anthony
2c5e044b59 Carries and closes 13361 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 18:12:52 -07:00
moxiegirl
7aa554c444 Merge pull request #14392 from moxiegirl/fix-fedora-table 
Table formatting was broken
 2015-07-04 16:30:17 -07:00
Sebastiaan van Stijn
57286aad25 Merge pull request #14235 from mlarcher/mlarcher-patch-2 
Add workaround in docs for git bash usage issue
 2015-07-04 21:00:53 +02:00
James Turnbull
f240bb5e94 Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page 
Fixing Wheezy link on debian installation page
 2015-07-04 14:57:00 -04:00
Mary Anthony
762214ccc8 Table formatting was broken 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 07:32:58 -07:00
Sebastiaan van Stijn
a89f4e36ab Merge pull request #14159 from tristan0x/patch-1 
docker-hub Admin right gives access to build logs
 2015-07-03 16:56:04 +02:00
Tristan Carel
515df52f19 Rewrite DockerHub group permissions documentation 
On behalf of @moxiegirl
    https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md

Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
 2015-07-03 16:29:30 +02:00
mlarcher
33be2c5d2e Add workaround in docs for git bash usage issue 
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751](https://github.com/docker/docker/issues/12751) but needs more visibility in the docs.

Signed-off-by: Matthieu Larcher <github@ringabell.org>
 2015-07-03 09:07:44 +02:00
ayoshitake
0ed7fd46b6 Edit "Working with Containers" page for readability 
Signed-off-by: ayoshitake <airandfingers@gmail.com>
 2015-07-02 23:10:36 -07:00
Arnaud Porterie
f0ed68f852 Merge pull request #14292 from calavera/fix_driver_detection 
Fix implicit DeviceMapper selection
 2015-07-02 11:33:55 -07:00
David Calavera
0a376291b2 Fix implicit DeviceMapper selection 
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.

With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-02 09:21:27 -07:00
Sebastiaan van Stijn
9300eb6684 Merge pull request #13825 from Mashimiao/unify-help-message 
Unify docker commands' usage in man and help
 2015-07-02 15:31:57 +02:00
wlan0
9b782d3af3 add support for maximum log size, and max number of log files 
Signed-off-by: wlan0 <sidharthamn@gmail.com>
 2015-07-02 06:26:06 -07:00
Ma Shimiao
f38232b475 Unify docker commands' usage in man and help 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-07-02 10:33:26 +08:00
Ankush Agarwal
942a0f994f Fix missing newline 
Fixes #14340

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-01 18:16:22 -07:00
Sebastiaan van Stijn
98f988f62c Merge pull request #13187 from shishir-a412ed/docker_inspect_issue 
Flag Addition: --type flag added for docker inspect command
 2015-07-02 01:31:15 +02:00
Sebastiaan van Stijn
f51d77f86e Merge pull request #12548 from camallen/docker_host_docs 
add note in docs about DOCKER_HOST env var overriding unix socket config
 2015-07-02 01:27:47 +02:00
Shishir Mahajan
2cb74e6915 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-07-01 12:14:01 -04:00
Peeyush Gupta
636ec6383b Fixing the table rendering in reference/run.md 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-07-01 16:07:39 +05:30
Quentin Tayssier
82b444e3fa Fixing Wheezy link 
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com>
 2015-07-01 13:01:00 +09:00
Sebastiaan van Stijn
a453da2114 Merge pull request #13962 from unclejack/shrink_docs_images 
docs: shrink some big images
 2015-06-30 21:55:44 +02:00
Ankush Agarwal
e7e48bcfdd Typo in memory-swap flag 
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-06-29 13:12:08 -07:00
Fred Lifton
0aea0e4072 Merge pull request #14261 from jeremyprice/basics-doc-typo-fix 
fix(docs): removed extra quote character in heading
 2015-06-29 11:05:54 -07:00
Jeremy Price
d612782023 fix(docs): removed extra quote character in heading 
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com>
 2015-06-29 09:46:50 -05:00
Mary Anthony
078b23a37d Closes #13323 and carries 
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-29 06:18:41 -07:00
moxiegirl
31ae9d876a Merge pull request #14126 from laijs/fix-file-permission 
docs: fix file's permissions
 2015-06-26 10:08:06 -07:00
Alexander Morozov
b96f109344 Merge pull request #12876 from tagomoris/logger-driver-fluentd 
Add new Logging driver "fluentd"
 2015-06-26 08:41:10 -07:00
Mary Anthony
d5de3ed09e Adding installation index 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-26 02:12:27 -07:00
Chris McKinnel
3c5b17cf7e Fix a broken anchor tag on the CLI builder page 
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com>
 2015-06-26 09:43:30 +01:00
TAGOMORI Satoshi
78f4a9dad4 Update English expressions by review comments 
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
 2015-06-26 11:04:26 +09:00
TAGOMORI Satoshi
361a582ba0 Add new logging driver: fluentd 
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
 2015-06-26 11:03:11 +09:00
John Howard
857e0ba32e Fix docs for #14047 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-25 13:39:12 -07:00
moxiegirl
de9c5473f7 Merge pull request #14178 from csarrazi/patch-1 
[Easy-Pick] [Documentation] Fix broken links for Fedora
 2015-06-25 13:15:26 -07:00
moxiegirl
8c8e8d624f Merge pull request #14156 from HuKeping/master 
Docs: fix wrong example of API Exec
 2015-06-25 13:09:36 -07:00
Mary Anthony
561bfb268d Splitting out the cli command into parts. 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-25 12:02:41 -07:00
Phil Estes
e8b87cfce1 Merge pull request #13907 from chenchun/exitcode 
Set exit code of old running container as 137
 2015-06-25 10:57:48 -07:00
Chun Chen
b0b2f979c7 Set exit code of old running container as 137 
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
 2015-06-25 22:30:09 +08:00
Mary Anthony
31dd97f4ad Breaking logging driver material out of run 
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-25 05:00:49 -07:00
Charles Sarrazin
62213219dc Fix broken fedora documentation 
The documentation is currently broken for the fedora page. This PR fixes missing the markup.

Signed-off-by: Charles Sarrazin <charles@sarraz.in>
 2015-06-25 10:16:46 +02:00
moxiegirl
4ab8b88286 Merge pull request #13973 from calavera/fix_zfs_options_doc_location 
Move zfs options doc to the storage section.
 2015-06-24 15:52:13 -07:00
Hu Keping
221fa4c3d1 Docs: fix wrong example of API Exec 
The last "," should not shown up, otherwise you will get the error
back as below:
- invalid character '}' looking for beginning of object key string.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-06-25 02:03:27 +08:00
Sebastiaan van Stijn
afd4d544cf Merge pull request #14119 from moxiegirl/fix-heading-blanks 
Fix heading blanks
 2015-06-24 08:35:42 -07:00
Alexander Morozov
4dd1d1bfa5 Merge pull request #13810 from d23/syslog-facility 
Add syslog-facility option
 2015-06-23 12:05:15 -07:00
Lai Jiangshan
f23698bb14 docs: fix file's permissions 
The README.md and the *.png should not have the executable
permissions, remove them.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
 2015-06-24 00:09:27 +08:00
Mary Anthony
960cbd2c8d Fixes #14117 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-23 05:17:20 -07:00
Mary Anthony
e81861ea54 Closes #14055 for anchal 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-23 05:14:53 -07:00
Dennis Docter
609e7b0a55 Add --log-opt to specify facility for syslog driver 
Signed-off-by: Dennis Docter <dennis@d23.nl>
 2015-06-23 14:04:25 +02:00
Tim Wraight
182d2668a1 Clarify .dockerignore example for Markdown files 
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.

Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk>
 2015-06-22 17:53:05 +01:00
Mary Anthony
efef353a29 Commenting out the release-notes for 1.6 
Original text

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-21 20:41:43 -07:00
Brian Goff
7491f9a9c1 Merge pull request #12099 from moysesb/12078-binary_remote_context 
Handle binary remote contexts when creating builder jobs.
 2015-06-21 13:59:26 -07:00
Sebastiaan van Stijn
67f9bbcbd4 Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2 
fix #11094 - Allow 'docker import' to load from local files
 2015-06-20 12:17:58 -07:00
Gildas Cuisinier
3f64b76d4c work on #11094 allow import from local file 
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
 2015-06-20 09:04:43 +02:00
Thomas Sjögren
a0a010e2e3 rpm name and location 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-06-20 01:14:58 +02:00
Moysés Borges
d48bface59 Support downloading remote tarball contexts in builder jobs. 
Signed-off-by: Moysés Borges <moysesb@gmail.com>
 2015-06-19 16:35:00 -03:00
Wenxuan Zhao
3dd134ceca Fix the url in comparison of "COPY" and "RUN curl" 
From context on next line,`tar -xJC` implies
the file is `big.tar.xz` instead of `big.tar.gz`.

Signed-off-by: Wenxuan Zhao <viz@linux.com>
 2015-06-18 12:33:46 -04:00
Campbell Allen
3cb9f7f6aa add note about DOCKER_HOST env var overriding unix socket config 
when trying to use docker without sudo and the DOCKER_HOST env var is set docker tries to connect to the specified host instead of using the unix socket.

Signed-off-by: Campbell Allen <campbell.allen@gmail.com>
 2015-06-18 06:51:21 +01:00
Mary Anthony
328dbd0aa2 Fixing seds, deleting old stuff 
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-17 21:05:37 -07:00
Mary Anthony
f9ab04ad13 First pass of updates 
Working docs
Update after check
update to centos 7 after second test
Updating with hopefully correct urls
Adding thaJetzah's comments
Updating with the new images
Updating after a visual check

Signed-off-by: Mary Anthony <mary@docker.com>

Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-16 16:29:11 -07:00
David Calavera
b674ae0639 Move zfs options doc to the storage section. 
Zfs options belong to the storage section, but they were added under the exec driver section.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-16 10:12:00 -07:00
unclejack
b68d0c6612 docs: shrink some big images 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-06-16 13:57:42 +03:00
ChaYoung You
3f4eeca68f Remove sources/ under docs directory 
See #13936.

Signed-off-by: ChaYoung You <yousbe@gmail.com>
 2015-06-16 19:15:48 +09:00
Mary Anthony
f93fee5f48 retooling for hugo 
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-15 13:19:38 -07:00
Sebastiaan van Stijn
637023a5f8 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
 2015-06-15 16:25:59 +02:00
Mary Anthony
cd44018856 Carry of PR #13520 
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-13 09:27:30 -07:00
Eric-Olivier Lamey
212dfb45de Fix docs URL not using https. 
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 04:50:50 +00:00
Jessica Frazelle
f88e620359 update gitignore for new manpages 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-10 16:11:15 -07:00
Mary Anthony
eacae64bd8 Moving man pages out of docs 
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-10 13:43:35 -07:00
Marius Sturm
96d06e106f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
 2015-06-10 20:21:50 +02:00
Jessie Frazelle
12149e8293 Merge pull request #13754 from cpuguy83/13753_fix_events_64 
Default events since to current time
 2015-06-10 10:34:13 -07:00
Brian Goff
74c12aa429 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 12:37:40 -04:00
Nicolas Borboën
e12839fa5a Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
 2015-06-10 13:27:55 +02:00
Sebastiaan van Stijn
90259fed2e Merge pull request #12031 from jlhawn/build_cache_ignore_mtime 
Make build cache ignore mtime
 2015-06-09 18:26:07 +02:00
Doug Davis
f4a3e8bef0 Fix COPY/ADD quoted/json form 
Minor tweak to the quoted/json form and made man page look like the Dockerfile
docs.  W/o the `,` people may think there should be a space delimited list.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-08 16:40:20 -07:00
Josh Hawn
cd7e2a6b2b [docs] Update builder docs on last-modified times 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-08 13:55:02 -07:00
Raghuram Devarakonda
bf6492e689 Fix examples in "docker port" man page. 
Closes #13667.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-06-08 10:40:24 -04:00
Eric-Olivier Lamey
68bfd9e3ae Tiny improvements to systemd docs. 
Show how to use `systemctl show` and recommend against modifying
system unit files in `/usr` and `/lib`.

Fixes #13796.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-08 12:05:34 +00:00
Eric-Olivier Lamey
173d0918a8 Fix a typo and a minor formatting issue in the docs. 
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-07 12:49:03 +00:00
James Turnbull
3c132ff62d Merge pull request #13764 from bcexelbi/bexelbie_man_typo 
Fixing typo in Dockerfile manpage
 2015-06-06 08:50:27 -04:00
moxiegirl
ffd74e74b1 Merge pull request #13776 from duglin/MinorVolDocEdit 
Minor doc edit to add clarity around the --volume path format
 2015-06-05 18:41:37 -07:00
Doug Davis
3fcf53db92 Minor doc edit to add clarity around the --volume path format 
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-05 15:11:42 -07:00
Christy Perez
77bd53adfe Update doc with usage of the scratch image 
The scratch image used to be a regular image, but as of
commit 8936789919 it is a
special case, and cannot be used with 'docker pull.'

Update this doc to reflect the new behavior and clear up
confusion surrounding this image.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-06-05 14:47:03 -05:00
Brian (bex) Exelbierd
d32e01be1a Fixing typo in Dockerfile manpage 
Signed-off-by: Brian Exelbierd <bex@pobox.com>
 2015-06-05 16:33:11 +02:00
Sven Dowideit
9ed2cb300b Bring over DHE docs updates for publishing 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-06-05 21:06:59 +10:00
moxiegirl
4efedb3fba Merge pull request #13716 from moxiegirl/move-experimental 
Moving experimental
 2015-06-04 09:11:00 -07:00
Jessie Frazelle
ca66419522 Merge pull request #13709 from jfrazelle/update-url 
Update urls from .com to .org.
 2015-06-03 14:21:38 -07:00
Mary Anthony
95dfc4c4a5 Moving experimental 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-03 13:43:27 -07:00
Jessica Frazelle
7943bce894 Update urls from .com to .org. 
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-03 13:28:47 -07:00
Antonio Murdaca
f18ce101fb Merge pull request #13165 from ahmetalpbalkan/durations 
Allow duration strings as --since/--until
 2015-06-03 22:14:42 +02:00
Ben Severson
a448b7aff2 quick doc fix for windows versions 
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com>
 2015-06-03 10:28:11 -07:00
Sebastiaan van Stijn
0636bb7b73 Merge pull request #13672 from LK4D4/syslog_tag 
Add syslog-tag option
 2015-06-03 17:04:59 +02:00
Qiang Huang
85fffe1341 Add docs for ip-forward 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-06-03 16:37:40 +08:00
Ahmet Alp Balkan
4e3b21f99e Allow duration strings as --since/--until 
Fixes #13107. This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.

Added unit tests for pkg/timeutils.GetTimestamp as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-06-02 21:02:47 +00:00
Alexander Morozov
3df19749d4 Wrap lines for journald docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:46:51 -07:00
Mary Anthony
cb4af853f6 Tweaking text identified in PR #13147 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-02 12:44:47 -07:00
Alexander Morozov
8979fe4d8a Change address to syslog-address in syslog docs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:44:23 -07:00
Alexander Morozov
a81af2e26a Add syslog-tag option for syslog log-driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-02 12:43:00 -07:00
Sebastiaan van Stijn
bdb6fad34c Merge pull request #13654 from porjo/netipv6 
Networking docs: add reference to ndppd
 2015-06-02 19:06:17 +02:00
Sebastiaan van Stijn
fbadf11d20 Merge pull request #13633 from ZJU-SEL/fix-doc 
fix typo.
 2015-06-02 18:36:52 +02:00
Ian Bishop
b1a1cff368 Networking docs: add reference to ndppd 
Signed-off-by: Ian Bishop <ianbishop@pace7.com>
 2015-06-02 15:56:24 +10:00
He Simei
0d72772c37 fix typo. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-06-02 09:44:52 +08:00
moxiegirl
cd79751cfa Merge pull request #13644 from mchiang0610/patch-1 
Fix - Download button does not download
 2015-06-01 17:33:38 -07:00
Alexander Morozov
cd80a61cc1 Merge pull request #13443 from duglin/CleanupEvents 
Cleanup container LogEvent calls
 2015-06-01 14:04:33 -07:00
Michael Chiang
5606f32eec Fix - Download button does not download 
Fix - Download button does not download

Users got confused when Kitematic is not being downloaded after clicking on the download button, and instead got brought to a screen to teach them how to download Kitematic.

The additional step caused a significant drop in Kitematic downloads. This pull request fixes the issue, to allow users to directly download Kitematic after clicking on the Download button. 

Signed-off-by: Michael Chiang <michael.chiang@docker.com>
 2015-06-01 13:29:44 -07:00
Doug Davis
8232312c1e Cleanup container LogEvent calls 
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.

Added testcases for new events: commit, copy, resize, attach, rename, top

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-06-01 12:39:28 -07:00
Phil Estes
d37aad170f Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental 
fix release script for experimental
 2015-06-01 12:29:45 -04:00
Mary Anthony
3ce2797541 Updating after the pr went through 
Updating with comments.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-01 09:20:31 -07:00
Tobias Gesellchen
16e649c589 indicate HostConfig to be used for "create container" 
Closes #13614

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-06-01 07:04:41 +02:00
Joe Gordon
3d87b80b46 Fix spelling mistakes in documentation 
While reading  some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings) on markdown files

Signed-off-by: Joe Gordon <joe.gordon0@gmail.com>
 2015-05-31 11:53:23 -07:00
moxiegirl
093f57a261 Merge pull request #13460 from moxiegirl/add-created-state-diagram 
Updating event diagram with the created state. Cool, thank you.
 2015-05-30 19:47:24 -07:00
James Turnbull
73683e807d Merge pull request #13616 from konstruktoid/docs_openssl 
Docs: sha256 and 4096 when using openssl
 2015-05-30 19:20:21 -04:00
Thomas Sjögren
5cd64cb93f aes256 and 4096 bits 
squashing down to a single commit and change back to cert.pem

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2015-05-31 01:05:49 +02:00
Sebastiaan van Stijn
f2154a5a6b Merge pull request #13367 from duglin/Issue13353 
Add a "Created" state for new containers that haven't been run yet
 2015-05-30 19:49:38 +02:00
Doug Davis
dc697b1c9f Add a "Created" state for new containers that haven't been run yet 
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-30 07:48:46 -07:00
Sebastiaan van Stijn
279c877451 Merge pull request #13580 from vdemeester/update-api-commit 
Update api documentation to add labels in commit
 2015-05-30 14:44:05 +02:00
Doug Davis
e51b311129 Premature newline insertions 
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-30 04:46:24 -07:00
Vincent Demeester
c61fa8471a Update api documentation to add labels in commit 
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-05-30 11:31:51 +02:00
Sebastiaan van Stijn
1613897d2d Merge pull request #13561 from icecrime/warn_overlay_docs 
Add note about overlay not being production ready
 2015-05-30 01:24:02 +02:00
Antonio Murdaca
c42ede311b Revert api doc for 1.19 about PortSpecs removal 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-30 00:32:03 +02:00
Arnaud Porterie
67cb748e26 Add note about overlay not being production ready 
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-29 13:53:09 -07:00
Antonio Murdaca
15134a3320 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:09 +02:00
David Calavera
f1fed87fc0 Merge pull request #13392 from runcom/syslog-connection-url-log-opt 
Add syslog-address log-opt
 2015-05-29 10:21:57 -07:00
Jessica Frazelle
b372f9f224 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 10:00:22 -07:00
moxiegirl
87d36079a7 Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs 
Fixing Mac Boot2Docker installation doc  Your fix has left the building.
 2015-05-29 09:13:04 -07:00
Hu Keping
22fda380a9 Fix inconsistent of remote API and document 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-29 22:56:35 +08:00
Anchal Agrawal
27ffccf540 Fixing Mac Boot2Docker installation doc 
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu>
 2015-05-28 22:53:54 -05:00
Jessie Frazelle
fcdea09ea5 Merge pull request #13530 from jfrazelle/bump-api-version 
bump api version to 1.20
 2015-05-28 16:14:30 -07:00
David Calavera
7317b84ce0 Merge pull request #13558 from calavera/doc_ulimit 
Add comment about ulimit format.
 2015-05-28 15:51:06 -07:00
Antonio Murdaca
e8c88d2533 Add syslog-address log-opt 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 00:42:11 +02:00
Jessica Frazelle
e76d0f5571 bump api version to 1.20 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-28 15:32:05 -07:00
Mary Anthony
30901609a8 Fixes to the 1.19 version 
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-28 14:25:26 -07:00
David Calavera
9292859fce Add comment about ulimit format. 
Fixes #12116

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-28 14:14:07 -07:00
Lloyd Dewolf
b4a52fc4e9 doc cli lint. 
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
  https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
 2015-05-27 15:07:57 -07:00
Dan Walsh
160dc79db0 Modify volume mounts SELinux labels on the fly based on :Z or :z 
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-27 12:50:16 -07:00
Lei Jitang
13f2aa7068 Add --net=container with --publish --publish-all --expose error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 15:31:06 +08:00
moxiegirl
e580734149 Merge pull request #13406 from moxiegirl/experimental-work 
Placeholder Part II: For commenting about install
 2015-05-26 18:19:26 -07:00
Mary Anthony
1ba1a0550f Fixes title, line wrap, and Adds install area 
Tibor's comment
Updating with the new plugins
Entering comments from Seb

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-26 15:37:38 -07:00
Jessica Frazelle
40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
James Turnbull
628c396555 Merge pull request #13467 from epc/epc-2015145 
Documentation Copy edits for typos
 2015-05-25 14:32:17 -04:00
Ed Costello
7d75c5be95 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
 2015-05-25 13:39:56 -04:00
Sebastiaan van Stijn
8efd87f5a2 Merge pull request #13447 from justone/mention-dockviz-alternative 
mention dockviz alternative
 2015-05-25 19:26:19 +02:00
Sebastiaan van Stijn
187362414d Merge pull request #13418 from donkirkby/patch-1 
small formatting and grammar fixes
 2015-05-25 19:15:47 +02:00
Nate Jones
453c0abf1c mention dockviz alternative 
closes #13431

Signed-off-by: Nate Jones <nate@endot.org>
 2015-05-25 09:43:25 -07:00
Sebastiaan van Stijn
c12081987a Merge pull request #13461 from moxiegirl/add-glossary-back 
Adding back in Glossary
 2015-05-25 18:32:15 +02:00
Sebastiaan van Stijn
5f57143b31 Merge pull request #13458 from janjaapdriessen/patch-1 
Fix markdown syntax for "docker run" instruction example
 2015-05-25 18:07:19 +02:00
Don Kirkby
5051aee555 small formatting and grammar fixes 
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.

The other two changes are just small grammar improvements.

Signed-off-by: don <donkirkby@gmail.com>
 2015-05-25 09:05:42 -07:00
Jan-Jaap Driessen
02405a96b2 Markdown changes (thanks to runcom for the rebase+squash handholding) 
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com>
 2015-05-25 17:24:41 +02:00
Mary Anthony
08da08f3f9 Adding back in Glossary 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-25 07:39:27 -07:00
Mary Anthony
9c65862cd6 Updating with the created state 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-25 07:33:01 -07:00
Lloyd Dewolf
ca23ac37ef doc: cli images examples rm "| head". 
It's a given that lines of example output might be truncated or come
from a contrived environment.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
 2015-05-24 14:04:13 -07:00
Arnaud Porterie
bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Mary Anthony
6de4138465 Finally, finally, close #12164 
Updating with typo Seb found

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-23 14:27:50 -07:00
Arnaud Porterie
8d0486832d Document in the experimental section 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
 2015-05-22 17:00:04 -07:00
David Calavera
ab8a5bcf04 Move Documentation changes out or this PR. 
The will come in a follow up PR inside the experimental section.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:58:48 -07:00
moxiegirl
8e76c0d1d8 Merge pull request #13303 from moxiegirl/experimental-work 
Experimental features placeholder
 2015-05-22 08:42:57 -07:00
David Calavera
a867c1b70a Mark volume drivers and plugins as experimental in the documentation. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Arnaud Porterie
4fc37a1ede Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 20:34:17 -07:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Sven Dowideit
740b1b5a2d Publish release notes for latest cs Docker engine 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-22 09:14:06 +10:00
Sebastiaan van Stijn
b639f00280 Merge pull request #13336 from calavera/document_missing_build_flags 
Document missing build flags.
 2015-05-22 01:03:37 +02:00
David Calavera
a85b09d8a4 Document missing build flags. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 15:02:00 -07:00
Mary Anthony
7231692a02 Experimental features placeholder 
Signed-off-by: Mary Anthony <mary@docker.com>

Adding experimental features into the mix

Signed-off-by: Mary Anthony <mary@docker.com>

renaming file

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-20 18:10:07 -07:00
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
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
Lars Kellogg-Stedman
869ecba652 journald log driver: use CONTAINER_ID field for container id 
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.

When using the journald log driver, this permits you to see log messages
from a particular container like this:

    # journalctl CONTAINER_ID=a9238443e193

Example output from "journalctl -o verbose" includes the following:

    CONTAINER_ID=27aae7361e67
    CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
    CONTAINER_NAME=web

Closes: #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-04-30 10:42:27 -04:00