Commit Graph
3720 Commits
Author SHA1 Message Date
David Calavera 740b021c6a 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>
Upstream-commit: 0a376291b2213699f986a7bca1cc8c4f4ed00f8d
Component: engine
2015-07-02 09:21:27 -07:00
Fred Lifton 0bc889c212 Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
fix(docs): removed extra quote character in heading
Upstream-commit: 0aea0e4072c403d7377ff63313196fb8fdabf9a1
Component: engine
2015-06-29 11:05:54 -07:00
Jeremy Price 184681a206 fix(docs): removed extra quote character in heading
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com>
Upstream-commit: d612782023f550d6990e9fc76c2a9de97ab97a43
Component: engine
2015-06-29 09:46:50 -05:00
Mary Anthony 4f74d3f3bd Closes #13323 and carries
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 078b23a37daf95101bf31bafc7f8396af7ad7d98
Component: engine
2015-06-29 06:18:41 -07:00
moxiegirl 229f4e374b Merge pull request #14126 from laijs/fix-file-permission
docs: fix file's permissions
Upstream-commit: 31ae9d876ad577775e8492065a02a364d745ccde
Component: engine
2015-06-26 10:08:06 -07:00
Alexander Morozov 009aa5c322 Merge pull request #12876 from tagomoris/logger-driver-fluentd
Add new Logging driver "fluentd"
Upstream-commit: b96f1093441a20678c9ff0e57528bbb780b34d10
Component: engine
2015-06-26 08:41:10 -07:00
Mary Anthony 4fb55aac44 Adding installation index
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d5de3ed09ec0fc218cb26bb5556b77043887902d
Component: engine
2015-06-26 02:12:27 -07:00
TAGOMORI Satoshi 6aea64cdef Update English expressions by review comments
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: 78f4a9dad4fb92fb2175ff5afe5fb2d7938e9668
Component: engine
2015-06-26 11:04:26 +09:00
TAGOMORI Satoshi 22652d4dad Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: 361a582ba0bccea04a8ea1799e68779fa66abb9f
Component: engine
2015-06-26 11:03:11 +09:00
John Howard a3f7d22b3d Fix docs for #14047
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 857e0ba32e38f02b96e7c6753d902aca7a7922fc
Component: engine
2015-06-25 13:39:12 -07:00
moxiegirl 3fae971f18 Merge pull request #14178 from csarrazi/patch-1
[Easy-Pick] [Documentation] Fix broken links for Fedora
Upstream-commit: de9c5473f769c6b18c1417525de3873304de2f80
Component: engine
2015-06-25 13:15:26 -07:00
moxiegirl 7241037f74 Merge pull request #14156 from HuKeping/master
Docs: fix wrong example of API Exec
Upstream-commit: 8c8e8d624f546e52d37ce09f5e16361bc38df073
Component: engine
2015-06-25 13:09:36 -07:00
Mary Anthony c4d8b40978 Splitting out the cli command into parts.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 561bfb268de3c674b04d48895b7e46ae890ef795
Component: engine
2015-06-25 12:02:41 -07:00
Phil Estes a6a8015e93 Merge pull request #13907 from chenchun/exitcode
Set exit code of old running container as 137
Upstream-commit: e8b87cfce10551ec132b470036c26374f1971fe1
Component: engine
2015-06-25 10:57:48 -07:00
Chun Chen 92372b77d4 Set exit code of old running container as 137
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
Upstream-commit: b0b2f979c7c43e2975d5e39340c168da2da42d1d
Component: engine
2015-06-25 22:30:09 +08:00
Mary Anthony dbd2bb096f 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>
Upstream-commit: 31dd97f4adb215b23504f72e7a17464bc6428419
Component: engine
2015-06-25 05:00:49 -07:00
Charles Sarrazin fe27ada373 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>
Upstream-commit: 62213219dc97a97471f8d7813aa61a74745ec902
Component: engine
2015-06-25 10:16:46 +02:00
moxiegirl 0a0ed52f4f Merge pull request #13973 from calavera/fix_zfs_options_doc_location
Move zfs options doc to the storage section.
Upstream-commit: 4ab8b8828666c8d0651e96d61b5c616d26c5e229
Component: engine
2015-06-24 15:52:13 -07:00
Hu Keping ce8189c680 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>
Upstream-commit: 221fa4c3d11973f6b973daf26fd962554945fc68
Component: engine
2015-06-25 02:03:27 +08:00
Sebastiaan van Stijn 798580eff0 Merge pull request #14119 from moxiegirl/fix-heading-blanks
Fix heading blanks
Upstream-commit: afd4d544cfabce9d2d8890e2c4a4e6f2f0a00a46
Component: engine
2015-06-24 08:35:42 -07:00
Alexander Morozov 892d0c95d1 Merge pull request #13810 from d23/syslog-facility
Add syslog-facility option
Upstream-commit: 4dd1d1bfa5ddb7295d001c5df35865da34ac048b
Component: engine
2015-06-23 12:05:15 -07:00
Lai Jiangshan 838eed9bed 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>
Upstream-commit: f23698bb142b2dab8c2a437503adc0e102d8c7c0
Component: engine
2015-06-24 00:09:27 +08:00
Mary Anthony 1547f31ef8 Fixes #14117
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 960cbd2c8dd7dfa794c11087babed46bea5d792e
Component: engine
2015-06-23 05:17:20 -07:00
Mary Anthony f157cc3d55 Closes #14055 for anchal
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e81861ea5419068e7919db892c8c9db53ae5bbe6
Component: engine
2015-06-23 05:14:53 -07:00
Dennis Docter f157b240b8 Add --log-opt to specify facility for syslog driver
Signed-off-by: Dennis Docter <dennis@d23.nl>
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
Mary Anthony 42eb9b230f Commenting out the release-notes for 1.6
Original text

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: efef353a297078a6036e071980e344e1534449e9
Component: engine
2015-06-21 20:41:43 -07:00
Brian Goff 22bde0c0c1 Merge pull request #12099 from moysesb/12078-binary_remote_context
Handle binary remote contexts when creating builder jobs.
Upstream-commit: 7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7
Component: engine
2015-06-21 13:59:26 -07:00
Sebastiaan van Stijn 36a670da43 Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
fix #11094 - Allow 'docker import' to load from local files
Upstream-commit: 67f9bbcbd4d741e22e61b21a411cd904dcd4329c
Component: engine
2015-06-20 12:17:58 -07:00
Gildas Cuisinier 8b52aa6697 work on #11094 allow import from local file
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
Upstream-commit: 3f64b76d4c66127466ce5b2ee0e8827eea7440b3
Component: engine
2015-06-20 09:04:43 +02:00
Thomas Sjögren 8bf35a9b77 rpm name and location
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: a0a010e2e3977f6f9e6271d3bb9e7abed783d47a
Component: engine
2015-06-20 01:14:58 +02:00
Moysés Borges 265055473c Support downloading remote tarball contexts in builder jobs.
Signed-off-by: Moysés Borges <moysesb@gmail.com>
Upstream-commit: d48bface59ef28aedc692c1f7c51a7ddde94a7fe
Component: engine
2015-06-19 16:35:00 -03:00
Wenxuan Zhao a4ba2df73f 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>
Upstream-commit: 3dd134cecaa045e73706c6ce4ab55188e98d1066
Component: engine
2015-06-18 12:33:46 -04:00
Mary Anthony c6caf278a1 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>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
Mary Anthony 759c0c7705 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>
Upstream-commit: f9ab04ad13863fca6e7b0f3d519dc9e0b08fc567
Component: engine
2015-06-16 16:29:11 -07:00
David Calavera 1f775ff99a 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>
Upstream-commit: b674ae0639a893c4b20a848e8ab837b8455f3aae
Component: engine
2015-06-16 10:12:00 -07:00
ChaYoung You 8758fd6f1e Remove sources/ under docs directory
See #13936.

Signed-off-by: ChaYoung You <yousbe@gmail.com>
Upstream-commit: 3f4eeca68f49a979e2d0af33a7d89bf3ceb62a73
Component: engine
2015-06-16 19:15:48 +09:00
Mary Anthony 9a276424db 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>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
Sebastiaan van Stijn f29d02bba3 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
Add --net=container with --publish --expose --publish-all error out
Upstream-commit: 637023a5f8d8347a0e271c09d5c9bc84fbc97693
Component: engine
2015-06-15 16:25:59 +02:00
Mary Anthony 57eb64c9c0 Carry of PR #13520
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cd44018856be421497a35d96f88dd0eec42fae43
Component: engine
2015-06-13 09:27:30 -07:00
Eric-Olivier Lamey 64aa4080a0 Fix docs URL not using https.
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 212dfb45dec64b470307aec22623f2d80be6695f
Component: engine
2015-06-11 04:50:50 +00:00
Jessica Frazelle 64af46488a update gitignore for new manpages
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f88e620359eaf986a843714126a9a7df5e25e115
Component: engine
2015-06-10 16:11:15 -07:00
Mary Anthony 84b8fc6fe1 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>
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
2015-06-10 13:43:35 -07:00
Marius Sturm 0c0594818f add UDP GELF logging-driver
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
2015-06-10 20:21:50 +02:00
Jessie Frazelle 52e2bdb4c8 Merge pull request #13754 from cpuguy83/13753_fix_events_64
Default events since to current time
Upstream-commit: 12149e829369e879a1978420b6ec2100a4b4fadd
Component: engine
2015-06-10 10:34:13 -07:00
Brian Goff 5a71e1d7b0 Default events since to current time
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
2015-06-10 12:37:40 -04:00
Nicolas Borboën 7b52c53f62 Typo psuedo - pseudo
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
2015-06-10 13:27:55 +02:00
Sebastiaan van Stijn 89751ffa0c Merge pull request #12031 from jlhawn/build_cache_ignore_mtime
Make build cache ignore mtime
Upstream-commit: 90259fed2ecc0b21a41e997bd4812aa845b79dfb
Component: engine
2015-06-09 18:26:07 +02:00
Doug Davis bff41b9dc6 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>
Upstream-commit: f4a3e8bef0070af6ad883fd06e504a8b1d4c93ba
Component: engine
2015-06-08 16:40:20 -07:00
Josh Hawn 4b582bde62 [docs] Update builder docs on last-modified times
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: cd7e2a6b2b529cb4180926352a3fe9e82040d073
Component: engine
2015-06-08 13:55:02 -07:00
Raghuram Devarakonda 87d1d89392 Fix examples in "docker port" man page.
Closes #13667.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: bf6492e689e2cb375fe6b39327dbe0655452640a
Component: engine
2015-06-08 10:40:24 -04:00