starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-07 02:24:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
16,463 Commits 13 Branches 322 Tags
793088ed0aebfb99177bd2f1edf7cf872e321ee9
Commit Graph
3729 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 807f056fef Merge pull request #13825 from Mashimiao/unify-help-message 
Unify docker commands' usage in man and help
Upstream-commit: 9300eb668459f1e21298db1de829265d6a4c9dd6
Component: engine
 2015-07-02 15:31:57 +02:00
Ma Shimiao 23dd86bcae Unify docker commands' usage in man and help 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f38232b475d126d6ea3a37d82be2c7269324e4ab
Component: engine
 2015-07-02 10:33:26 +08:00
Ankush Agarwal ee7a0ea07c Fix missing newline 
Fixes #14340

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 942a0f994f1c6da840086cbcd2933e23521a2953
Component: engine
 2015-07-01 18:16:22 -07:00
Sebastiaan van Stijn 8211ecfd09 Merge pull request #13187 from shishir-a412ed/docker_inspect_issue 
Flag Addition: --type flag added for docker inspect command
Upstream-commit: 98f988f62ceccf7237cbcb45f1095ff15f005ea9
Component: engine
 2015-07-02 01:31:15 +02:00
Sebastiaan van Stijn a41be0879e Merge pull request #12548 from camallen/docker_host_docs 
add note in docs about DOCKER_HOST env var overriding unix socket config
Upstream-commit: f51d77f86e533f6fb4892f6aa0ae7646a7dfbdad
Component: engine
 2015-07-02 01:27:47 +02:00
Shishir Mahajan 8aaef3e5b3 Flag Addition: --type flag added for docker inspect command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
 2015-07-01 12:14:01 -04:00
Sebastiaan van Stijn 5b89db2050 Merge pull request #13962 from unclejack/shrink_docs_images 
docs: shrink some big images
Upstream-commit: a453da21147cefefae52e95a54e427cb4b211e81
Component: engine
 2015-06-30 21:55:44 +02:00
Ankush Agarwal 14f61357df Typo in memory-swap flag 
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: e7e48bcfddf8f2a28fcb79f0282afd1fc86133fb
Component: engine
 2015-06-29 13:12:08 -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
Campbell Allen f7e74202dd 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>
Upstream-commit: 3cb9f7f6aaa8f39f7f73e205260a213a6e398416
Component: engine
 2015-06-18 06:51:21 +01: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
unclejack da3cda1d01 docs: shrink some big images 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b68d0c6612bdb0c4d006fb0c8763345e864b13d4
Component: engine
 2015-06-16 13:57:42 +03: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