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
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
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
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
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
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
92bcbdcb5f
Fixing issues in command ordering. Adding index.md
...
Adjust bullets
Entering Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
2015-10-08 09:28:46 -07:00
6ff15cb8df
Merge pull request #16828 from jwayong/jwayong/docs
...
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
282a5880a8
Merge pull request #15265 from greaber/dockerignore-docs
...
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
0012e76955
update dockernetwork.md and network api
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
7fe62e2968
Add description for "--cpu-shares=0".
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b7249569e27e1962c69eef2b8f547fb6fb7ad367
Component: engine
2015-10-08 10:50:55 +08:00
47fa2052c1
Add TLS support for discovery backend
...
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS. Example usage:
docker daemon [other args] \
--cluster-advertise 192.168.122.168:2376 \
--cluster-store etcd://192.168.122.168:2379 \
--cluster-store-opt kv.cacertfile=/path/to/ca.pem \
--cluster-store-opt kv.certfile=/path/to/cert.pem \
--cluster-store-opt kv.keyfile=/path/to/key.pem
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 124792a8714425283226c599ee69cbeac2e4d650
Component: engine
2015-10-07 16:01:00 -07:00
9c388a6249
Docs: Add docker-elements to remote API client lib doc page
...
This closes #16824
Signed-off-by: Januar Wayong <januar@gmail.com >
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
2015-10-08 08:45:35 +11:00
5e87c46dcd
clarify dockerignore semantics
...
Signed-off-by: Grant Reaber <grant.reaber@gmail.com >
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
2015-10-07 15:51:57 -05:00
780fae5a2c
Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
...
Don't put dockerfiles in one continuous code block
Upstream-commit: 4c1540c8d2bb57123a4faa769d78cdf6202d4314
Component: engine
2015-10-07 13:40:19 -07:00
6b3f6691b5
Merge pull request #16645 from mavenugo/ux
...
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
80c6a28fe2
Merge pull request #16807 from jfrazelle/rename-flag
...
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
3ba7e5f650
change flag name to better follow the other flags that start with disable;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
af07841b68
Networking API and UX documentation
...
More doc updates will follow
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
917e7739ac
Mention more realistic examples are available
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 4cb0790a620924a9fe5d751c6c7e6b37183697df
Component: engine
2015-10-07 11:45:57 +01:00
000787bb0d
Don't put dockerfiles in one continuous code block
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 6a1a192e072cc44d80230626071efe756d77d373
Component: engine
2015-10-06 22:58:42 +01:00
cd659bcc9c
devmapper: Provide option to enabled deferred device deletion
...
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.
Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 51e059e7e90f37848596a0b6ec83f7835e6e4131
Component: engine
2015-10-06 17:37:21 -04:00
3010ed375d
Docs: add Docker version/API version matrix
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6a45bed9bfe66dc17a6aa04591d8c5ae39ba531a
Component: engine
2015-10-06 01:04:15 +02:00
a2758a7a50
Merge pull request #16647 from vdemeester/revert-env-validation-docs
...
Update documentation on the revert on env validation
Upstream-commit: e1d3cb89f16c90a3ec6777e34c769cc2a35d123e
Component: engine
2015-10-05 15:27:45 -07:00
c1ad8272d0
Update documentation on the revert on env validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b3fe785c7267bff533c9b2fc324c58e37796e973
Component: engine
2015-10-04 23:04:36 +02:00
72f4bc7137
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
b51b5af287
Fix man and commandline docs
...
- missing help option in `docs/reference/commandline/*.md` (some files
have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com >
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
883f553c16
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c1713e7c5a8f2eee7d78b17eef81b0d4203aabdd
Component: engine
2015-10-02 16:45:08 -04:00
a9fcaeb043
Make exec start return proper error codes
...
Exec start was sending HTTP 500 for every error.
Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.
Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
f5fe88af39
Merge pull request #16680 from dnephin/update_list_image_api_docs
...
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
