efafa4e0c7
Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts
...
Deprecate -c cli short variant flag in docker cli build & create
Upstream-commit: ab1f03397ed48440454332598fa707afa9187b42
Component: engine
2015-10-17 10:22:46 +02:00
b8701b18c6
Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
...
remove incorrect "readonly" example
Upstream-commit: 475be776b877c787c7e679cfb0a60b888823ed86
Component: engine
2015-10-16 15:11:48 -07:00
943431b7fa
Deprecate -c cli short variant flag in docker cli
...
- build
- create
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
2015-10-17 00:05:34 +02:00
a120d9f127
Merge pull request #17085 from dnephin/add_digest_to_api_docs
...
Correct API docs for /images/create
Upstream-commit: e2870bda43aef2e7649bf811b451d765ed16b4c4
Component: engine
2015-10-16 10:10:41 -07:00
aa3a6d8798
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ee30af5ffb9b4db808c7e1e6db69c0c600e525c7
Component: engine
2015-10-16 06:09:03 -07:00
8cbac2fa0e
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e44876bf1fdb114a4730ef72f00e88c057abfb45
Component: engine
2015-10-16 06:07:52 -07:00
494b1b71ae
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2ec4404ba039c6e6c40358cecd7d7ca16ee5b3e7
Component: engine
2015-10-15 16:00:05 -04:00
2a30cdb717
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
2015-10-15 11:00:43 -07:00
46bdc83696
Merge pull request #16998 from vieux/engine_version
...
only display 'Engine Version' when it's not empty
Upstream-commit: 9216b085363f4551ffe3b6cdba983eba3b945205
Component: engine
2015-10-15 08:43:32 -07:00
7b66bab8fb
Added network to docker --help and help cleanup
...
Fixes https://github.com/docker/docker/issues/16909
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
2015-10-15 03:10:39 -07:00
453cdc0662
remove incorrect "readonly" example
...
The :ro option can only be used for named and bind-mounted
volumes, not on "regular" (unnamed) volumes as explained in
https://github.com/docker/docker/pull/16013#issuecomment-146647216
The example in the documentation actually resulted in a
bind-mounted volume, mounted at "ro" inside the container.
This removes the incorrect example from the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 244d9c337034b0db030c05189ca8eb2323d92c61
Component: engine
2015-10-14 17:56:38 -07:00
fbe671eb09
use Server Version
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340
Component: engine
2015-10-14 17:46:59 -07:00
f672c8b33c
Merge pull request #16617 from zhangjianfnst/15869-improve-commandline-doc
...
Improve the way we deliver Examples in command line.
Upstream-commit: 2b4128e904cf5ffc288e45dbc049de73a905e4e6
Component: engine
2015-10-14 11:05:27 -07:00
556b9df83a
Improve the way we deliver Examples in command line. (Add descriptive titles)
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: cc653b5d616ee8823c13b1b35ecf5f00e15463a8
Component: engine
2015-10-14 11:04:51 +08:00
98858eadeb
Bump API Version to v1.22
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
2015-10-13 17:27:33 -07:00
019ffb819f
Merge pull request #15796 from azurezk/add-size-to-inspect
...
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
517874fd19
Merge pull request #16965 from mikebrow/docs-improvement-for-expose-16634
...
updating docs for EXPOSE option on run command
Upstream-commit: 9be87c9a96ba902214609bf486951a7dc171b82f
Component: engine
2015-10-13 11:33:28 -07:00
21b8dc752f
Merge pull request #16946 from pwnall/cpu_quota_docs
...
Document CFS CPU period / quota support in the API
Upstream-commit: 9ead1663c3c4e9841cd4fb9f8517e5a88cd3f0b6
Component: engine
2015-10-13 10:51:48 -07:00
ba16a5cc21
Centralize discussion of behavior label and env.
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 39a71acf7e18c2d00d32b01db3daaebc7392d92a
Component: engine
2015-10-13 09:44:17 -07:00
d174ec9645
Merge pull request #16961 from vdemeester/pr-15975-carry-for-docs
...
Carry #15975 - Add extra fields based on label and env for gelf/fluentd/json-file/journald log drivers
Upstream-commit: 3856c5efa685013b5e82347d5812de4c7788d4ff
Component: engine
2015-10-13 09:30:32 -07:00
00116420f7
updating docs for EXPOSE option on run command; fixes #16634
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: d955fdb9ac279d5ea8e5fd20719eda579cca97ed
Component: engine
2015-10-13 10:43:27 -05:00
76cc1c235d
Add docs for label/env log-opts
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cd426ebed79e29153eb29ea1ccb260e15db2fea5
Component: engine
2015-10-13 08:39:47 +02:00
939faf2998
Merge pull request #16009 from azurezk/vol-create-conflict-option
...
volume create error on conflict option
Upstream-commit: df79536769eab04a7f1c618f9a390b36be6c53be
Component: engine
2015-10-12 15:27:36 -07:00
8c9497957a
Merge pull request #16942 from physicalit/master
...
Add CMD and EXPOSE instruction example
Upstream-commit: dc500630ec0e6c69822bf6cd62a40ed6d029e2d3
Component: engine
2015-10-12 15:26:30 -07:00
ce2e2998fb
Document CFS CPU period / quota support in the API.
...
Docker 1.7 got support for specifying the CFS scheduler's CPU quota and
period. The work appears to have started around commit
dcc50e1d593fd7995189872791c6d7a013f16970. This change updates the API
documentation to reflect the existing support.
Signed-off-by: Victor Costan <costan@gmail.com >
Upstream-commit: 26bd356078a02313649c7562369a2b2de6b63e19
Component: engine
2015-10-12 11:26:39 -04:00
bed0f28df0
Document updates for cluster-store-opt
...
This updates the docs for the daemon based on the new cluster-store-opt
for TLS support.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: ab83cf37c9df38e058938ef762aaefbc85f98f7d
Component: engine
2015-10-12 08:05:02 -07:00
88979b7a5e
Add CMD and EXPOSE instruction example
...
Signed-off-by: Mihuleacc Sergiu <mihuleac.sergiu@gmail.com >
Upstream-commit: fad2cc6a18f28658b99be8f2951290b03ccbabf0
Component: engine
2015-10-12 17:30:47 +03:00
6841b07f52
volume create error on conflict option
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 0ff3123eba071166def8072d8c7f3aa9afa0b56f
Component: engine
2015-10-12 11:16:39 +08:00
b34ed2cbab
Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
...
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
2015-10-11 15:35:04 -07:00
7dfb385d48
Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
...
Docs: add Docker version/API version matrix
Upstream-commit: 70edf41c06719912e1d787f9f9e77705c81a0228
Component: engine
2015-10-11 15:28:46 -07:00
6b6c7cc2b6
Enabled GitHub Flavored Markdown
...
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
9375e8c909
add size to inspect
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08:00
2000bb0d9e
fix depreciation dates
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 26701e2d9fc9e45f39b091351088b6b9a9f019d5
Component: engine
2015-10-09 20:24:04 -07:00
4e6b402919
Default the tcp port to 2376 if tls is on, and 2375 if not
...
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
2015-10-09 17:48:03 -07:00
f27c37e60e
Changing docs to reflect new names
...
Signed-off-by: Diogo Monica <diogo@docker.com >
Upstream-commit: d9a2fadb5e26cb0e8e79c260b74236a16d9a9e33
Component: engine
2015-10-09 15:13:37 -07:00
6d8620acc6
Merge pull request #16604 from mountkin/add-missing-commit-parameters
...
add missing parameters of the commit API to the docs
Upstream-commit: dbc20693f7bc6ce9bc1da3f6c4c0cd725e0454c1
Component: engine
2015-10-09 20:55:54 +02:00
1863ad7ae9
Merge pull request #16287 from mikebrow/16055-man-update-for-docker-run-with-host-volumes
...
man update for docker run with host volumes
Upstream-commit: 26ee5fea02c7e7d09addc13275a0a44d2f608a4c
Component: engine
2015-10-09 09:24:11 -07:00
7318a696ed
add missing parameters of the commit API to the docs
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: b69f4f3c1366385468e140613aedfc41038a4b35
Component: engine
2015-10-09 23:21:12 +08:00
629317774a
Merge pull request #16108 from charleswhchan/patch-2
...
Touch up Node.js and MongoDB examples
Upstream-commit: 3526993b2f2a490f29f291677d765face43a7bc7
Component: engine
2015-10-09 15:33:30 +02:00
ccb8fd3e79
Merge pull request #16876 from luca3m/patch-1
...
Sync with remote API
Upstream-commit: 06146b333cb18dd3997e9c3632d79771ba79145c
Component: engine
2015-10-09 06:30:02 -07:00
c902cdd516
Merge pull request #16833 from sunyuan3/cpu-shares
...
Add description for "--cpu-shares=0".
Upstream-commit: 734c9d2f67ada2dcc26a5a9b23f9fd5de0421c1f
Component: engine
2015-10-09 06:29:18 -07:00
0de3aef69d
Merge pull request #15903 from charleswhchan/patch-1
...
Revise documentation for Docker LABEL.
Upstream-commit: b7083cf08bc37e52cf7c49ce4f7d42f30576dbd0
Component: engine
2015-10-09 06:11:50 -07:00
2a3da85fc7
Sync with remote API
...
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Sync also container events
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Sync also man page
Signed-off-by: Luca Marturana <lucamarturana@gmail.com >
Upstream-commit: d7ca0a48ac827c394f406787d1b28301da3c9a13
Component: engine
2015-10-09 13:53:51 +02:00
774ab0f6af
Revise documentation for Docker LABEL, including review comments by @SvenDowideit and @thaJeztah in PR #15903 .
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c7e0531c3ab1844423e64ef49619faa24471f2e3
Component: engine
2015-10-08 20:47:09 -07:00
f8f0e2ad59
Merge pull request #16861 from moxiegirl/fix-testing-stuff
...
Removing the tests.
Upstream-commit: bccf5c756b1aa80832ff6ca54ff539b71ab73faa
Component: engine
2015-10-09 00:46:02 +02:00
f583b724cf
Removing the tests. We have training site now.
...
Ugh...actually adding the files to delete
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5a94d2b5b9dc0d09d8113396f26d1757142c0661
Component: engine
2015-10-08 15:22:59 -07:00
2c93131473
Merge pull request #16644 from dhiltgen/discovery_tls
...
Add TLS support for discovery backend
Upstream-commit: b50a88cfd78498e5cd943ee3964585a73067e3e4
Component: engine
2015-10-08 14:21:06 -07:00
b07ff86773
Merge pull request #16837 from x1022as/network
...
update dockernetwork.md and network api
Upstream-commit: 246072e8c5184c78edc9f40435987a7ba26baaa8
Component: engine
2015-10-08 12:27:49 -07:00
30a049bac1
Merge pull request #16850 from moxiegirl/fix-command-meta
...
Fixing issues introduced with new commands adding index
Upstream-commit: 80469f8180506b8e3a04e63766b15caddffa9726
Component: engine
2015-10-08 20:59:59 +02:00
336ef562f3
Merge pull request #16791 from flaccid/patch-1
...
Do not run yaourt as root/sudo
Upstream-commit: 73e3d85c28e4fefb035d73ea0e57c6502409b01a
Component: engine
2015-10-08 11:50:56 -07:00
