docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
21,905 Commits 12 Branches 296 Tags
37c50543e9778e247ebf017ee73e703fd17b2af7
Commit Graph

4790 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
ec3cd49e30 Fix memory-swap description in older API versions 
A value of -1 disables the *limit* so enables unlimited swap

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1c95b858ac040974d2be73bb31d0d59af9b0b960
Component: engine
 2016-02-02 14:49:14 +01:00
Kai Qiang Wu(Kennan)
642e9a30eb Correct old virtual size 
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
 2016-02-02 12:28:33 +00:00
David Calavera
252a3f9cb5 Merge pull request #19794 from calavera/14358-disable-colors 
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
Upstream-commit: 85475f7deabed7d94e98321bdb190f7eb756eaec
Component: engine
 2016-02-01 15:37:44 -08:00
Sebastiaan van Stijn
6118a0b79d Merge pull request #19898 from joelwurtz/patch-1 
Update docker-php link library from stage1
Upstream-commit: cf93b0bce1b24d30c9a1480ddb15a1f83f2b5fd4
Component: engine
 2016-02-01 23:37:11 +01:00
Sebastiaan van Stijn
6dc1df39d7 Merge pull request #19714 from vdemeester/carry-pr-18787 
Carry #18787: Update Instructions for Docker Remote API access
Upstream-commit: d95c4872135b0926e7911bf2b0b699e347c41e82
Component: engine
 2016-02-01 23:26:40 +01:00
Joel Wurtz
ba3948fd3c Update docker-php library from stage1 
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com>
Upstream-commit: 9928b244e9c1eb32eb63fc7a9666a946ca8729d6
Component: engine
 2016-02-01 22:45:34 +01:00
Vincent Woo
fb14e6604b Allow disabling of colored Docker logs via daemon flag. 
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
 2016-02-01 16:19:18 -05:00
Vincent Demeester
1b865aed78 Add docker-volume-ipfs plugin to the list. 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b01886a556db9738b226fbcdd2384aff34118413
Component: engine
 2016-02-01 13:30:15 +01:00
Felix Hupfeld
21a85d3fd5 Added link to Quobyte's volume plugin. 
Signed-off-by: Felix Hupfeld <felix@quobyte.com>
Upstream-commit: 518c20787b5691e41261218b8b4e6671ddc646f3
Component: engine
 2016-02-01 12:51:05 +01:00
qg
af0e1e3cc9 change 'host:port' to host:port 
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
Upstream-commit: 7d1018545f5c38c936ed893145e70f84b8f50976
Component: engine
 2016-02-01 17:22:16 +08:00
Weiyang Zhu
529d3187ec Fix upgrade command 
Signed-off-by: Weiyang Zhu <cnresonant@gmail.com>
Upstream-commit: a80c404cc61344067ae319ff82f78a22b31d4dbf
Component: engine
 2016-02-01 12:59:21 +08:00
Prayag Verma
7637bcdb16 Fix typo 
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
Upstream-commit: 86beb6e27e9954e50828993ef0fb44486d2318ab
Component: engine
 2016-02-01 01:25:59 +05:30
Nigel
486d68813e Updating for CAS changes and new select a driver section 
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes #19240
Updating with content addressable storage model changes

Signed-off-by: Nigel <nigelpoulton@hotmail.com>
Upstream-commit: 89923c1f32aeff5bf11fbb04723dd0e154559545
Component: engine
 2016-01-30 18:03:04 -08:00
Sebastiaan van Stijn
18160b41cf Merge pull request #19846 from shin-/remote_api_container_update_doc 
Update example request for container update in docs.
Upstream-commit: d069e8e7b7733fbde5889d3afd97cac21ff474b3
Component: engine
 2016-01-30 08:05:55 -08:00
Vincent Demeester
8c7b621b27 Merge pull request #19646 from nishanttotla/19277-CustomInfoField 
Display SystemStatus field in docker info
Upstream-commit: 6b573801730f7655a1e2ef1edc35df8e32b713f7
Component: engine
 2016-01-30 11:48:01 +01:00
Joffrey F
6d05098f7a Update example request for container update in docs. 
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 5f0643b082d4fe5a7be9fa0a00088e3e37882824
Component: engine
 2016-01-29 18:35:29 -08:00
Nishant Totla
9aabd7572f Adding SystemStatus field for /info endpoint 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a
Component: engine
 2016-01-29 16:26:43 -08:00
Wen Cheng Ma
e4d391225e Change container name to id as actual results 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: d76fba0191fc64759febc1ee22c6bc28ff49b3d6
Component: engine
 2016-01-29 13:54:28 +08:00
Vincent Demeester
87883a2e64 Merge pull request #19769 from HackToday/fixubuntudoc 
Make install instruction consistent
Upstream-commit: 7ee1aaf06d311856f0e8b4b4c21249458e01fc77
Component: engine
 2016-01-28 08:31:45 +01:00
Vincent Demeester
45d01482b0 Merge pull request #19401 from wenchma/18410-default_net_driver 
docs: document options for default network driver
Upstream-commit: adb9fa736283bd0c57edccd44819207c63f8be98
Component: engine
 2016-01-28 08:30:30 +01:00
Kai Qiang Wu(Kennan)
eff09fc3a5 Make install instruction consistent 
Right now in ubuntu section, instruction is not consistent
for sudo, so it is better to keep it style same.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: b02552124b5241d4f29d4d69de26e84110cc562c
Component: engine
 2016-01-28 06:54:59 +00:00
Wen Cheng Ma
9cc23f26d7 docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
 2016-01-28 11:49:07 +08:00
David Calavera
154bed9787 Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag 
Added flag to ignore fluentd connect error on container start
Upstream-commit: 7a016578dbb5c9b8a43b43e1ce96785fa26baf56
Component: engine
 2016-01-27 14:25:24 -08:00
Sebastiaan van Stijn
c193203fff Merge pull request #19741 from jfrazelle/better-apparmor-docs 
way better apparmor docs
Upstream-commit: c1191eb0e83629a6623ee6119ddb7097538f3fc3
Component: engine
 2016-01-27 14:22:54 -08:00
Jessica Frazelle
dcac710fd9 way better apparmor docs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a6701790ee585c625c6a39413d2772dc7ecf80fd
Component: engine
 2016-01-27 14:08:42 -08:00
Vincent Demeester
24f696e76e Merge pull request #19721 from bboreham/doc-ip-failure 
Improve wording about re-assigning IP addresses
Upstream-commit: 7beccdc609667e6ec7517494779bbb2ef61102af
Component: engine
 2016-01-27 22:17:06 +01:00
Tomasz Kopczynski
53da62423e FAQ: add docker daemon unavailable note 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 83c1fd6f53d1b061fd71057210a6e317fcd56359
Component: engine
 2016-01-27 21:18:02 +01:00
Aditi Rajagopal
326b3eb110 Update Instructions for Docker Remote API access 
Update the location of cert.pem and key.pem to use within the
~/.docker folder
Resolves: #18778

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 3fd25d98b818c5e381571c9ba6ee7d00984f6bc7
Component: engine
 2016-01-27 18:49:31 +01:00
Bryan Boreham
5cfcf48d8a Improve wording about re-assigning IP addresses 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: caad94d7bb12f07976141b4e7bc04f94f0380961
Component: engine
 2016-01-27 17:11:12 +00:00
Ivan Babrou
8977875ac5 Add tag support to journald logging driver, closes #19556 
Signed-off-by: Ivan Babrou <ibobrik@gmail.com>
Upstream-commit: 5a3351883b254d3690e9dcc5b89293bcee474493
Component: engine
 2016-01-27 10:52:19 +00:00
Sebastiaan van Stijn
3bba97b9dd Fix docs for tmpfs (pr 19688) 
Underlying files are no longer copied to the tmpfs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
 2016-01-26 23:52:14 -08:00
Jussi Nummelin
9669dc677a Added flag to ignore fluentd connect error on container start 
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>

Changed buffer size to 1M and removed unnecessary fmt call

Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>

Updated docs for the new fluentd opts

Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
Upstream-commit: 3cf82ff1ab14e1ddd2b629524e894ac359168388
Component: engine
 2016-01-27 09:05:44 +02:00
Tibor Vass
a374e9a1d6 Merge pull request #19737 from calavera/fix_reload_docs 
Remove cluster storage advertise from reload.
Upstream-commit: 7992b353c04b4214c28d5be6195b2703a52defb1
Component: engine
 2016-01-26 17:04:46 -08:00
Mary Anthony
e734434f58 Creating Engine specific menu 
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
 2016-01-26 15:58:53 -08:00
David Calavera
2a5a8c6749 Remove cluster storage advertise from reload. 
Because libnetwork won't really send container information to the new
storage anyways.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: fa163f5619bb01cabca1c214b59e14518a797a7a
Component: engine
 2016-01-26 18:19:30 -05:00
Brian Goff
08577a13fd Add note about mount propagation on systemd 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7d7b2044b76a7f3a332f3c9bdb17dd8b4e66ee22
Component: engine
 2016-01-26 16:48:45 -05:00
Victor Costan
ae9bd7f8a5 Add missing words in selectadriver.md 
Signed-off-by: Victor Costan <costan@gmail.com>
Upstream-commit: e5e90347d28c11b6000cb5471454d24f3aa8b421
Component: engine
 2016-01-26 01:06:59 -05:00
Sebastiaan van Stijn
531573357d Merge pull request #19683 from calavera/network_config_file 
Allow network configuration via daemon config file.
Upstream-commit: 5b0183e91c173c06bcbb5d53da03f13519c14c87
Component: engine
 2016-01-25 18:59:20 -08:00
Tibor Vass
360e6f6c70 Merge pull request #19568 from cpuguy83/17907_fix_rmv 
On container rm, don't remove named mountpoints
Upstream-commit: 58c2488d07f4c984c853ca4b4a5c86b55c4c784c
Component: engine
 2016-01-25 18:13:57 -08:00
David Calavera
3ec10b17fa Allow network configuration via daemon config file. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c539be88332815aeb2d466a973443127c1c676a6
Component: engine
 2016-01-25 18:54:56 -05:00
Sebastiaan van Stijn
2c020b81f9 Merge pull request #19074 from arun-gupta/couchbase 
adding docs for Dockerizing Couchbase service
Upstream-commit: 2b97c9674258e0dc0b36526176b2f2cea85b40fe
Component: engine
 2016-01-25 15:46:56 -08:00
Brian Goff
7e07ac8939 On container rm, don't remove named mountpoints 
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.

Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: dd7d1c8a02d8693aa4f381f82c5bbdcad9a5ff58
Component: engine
 2016-01-25 15:51:28 -05:00
Sebastiaan van Stijn
93f57e97b4 Fix remove API order in menu 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 42f6e8d40d059c8d53adaada24b400761f42ec5b
Component: engine
 2016-01-24 02:48:47 -08:00
Sebastiaan van Stijn
c418f65372 Merge pull request #19622 from r4j4h/quick-doc-fix 
Correcting `overlay` -> `bridge` driver in run.md
Upstream-commit: 037d159981c8f8d79f8f445df502527e635d525c
Component: engine
 2016-01-24 00:42:36 -08:00
Jasmine Hegman
f308df2986 Correcting overlay -> bridge driver in run.md 
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.

Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
Upstream-commit: ae5fce9fe02523e7a43ddd533f645d1a8fb20193
Component: engine
 2016-01-24 01:34:04 -07:00
companycy
45cae822ec Update aufs-driver.md 
fix typo in file path for image layers

Signed-off-by: bjcheny <companycy@gmail.com>
Upstream-commit: ac1eac21c91c1b8395a0356699f58f1d91d0d173
Component: engine
 2016-01-24 10:03:29 +08:00
Sebastiaan van Stijn
a12671092e Merge pull request #19592 from duglin/Issue15777 
Add some helper text for magical ADD
Upstream-commit: bf85a49509ef67eb68a2251928385a221a85254e
Component: engine
 2016-01-22 18:27:44 -08:00
Sebastiaan van Stijn
a793a1a33c Merge pull request #19596 from Djelibeybi/fix-oracle-install-docs 
Updated Oracle Linux install documentation
Upstream-commit: 2d30720c1e2fedca5534e0cc5b0763162f740501
Component: engine
 2016-01-22 17:27:42 -08:00
Avi Miller
112e739739 Updated Oracle Linux install documentation to be more accurate. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 081bffc1e1ff869a8215b9b8b439d4cb9f6a144a
Component: engine
 2016-01-23 12:18:41 +11:00
Mary Anthony
4749465580 Fixing missing certs article; consolidating security material 
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4c76c665b73dbd0beb0cb465caa921cbeb1cf61f
Component: engine
 2016-01-22 16:44:18 -08:00