26325c0024
Merge pull request #32908 from yuexiao-wang/fix-plugin-typos
...
fix some typos for plugin
Upstream-commit: 42636920d34e02f9bf58e69b5e0b8e44b5fb097f
Component: engine
2017-04-28 19:09:23 -07:00
8c18e7684d
Merge pull request #32516 from thaJeztah/deprecate-async-service-commands
...
Deprecate "asynchronous" service create and service update
Upstream-commit: f1571e8b67b4014189e356d20d4f388f0e9e88d3
Component: engine
2017-04-28 16:08:38 -07:00
8f749648eb
Merge pull request #32888 from denis-soundcloud/clarify-env-file-without-value
...
Clarify --env-file usage with names without values
Upstream-commit: cc9dc643eae5e491b64985c4c787de4ce79d5ac3
Component: engine
2017-04-28 16:03:24 -07:00
5b4b113f26
fix some typos for plugin
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 6353f993d9c5e05ae5cc1c235de7d23cae7c5bd7
Component: engine
2017-04-28 23:47:45 +08:00
dd2000929f
Clarify --env-file usage with names without values
...
Signed-off-by: Denis Defreyne <denis@soundcloud.com >
Upstream-commit: ebe0a489a5cc66406345f1aafa0f2f866fd64172
Component: engine
2017-04-28 09:03:40 +02:00
d2502dd75f
fix typo in plugins_logging.md
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 3875305284e6d17874bd31a17fe31621a6a09169
Component: engine
2017-04-27 21:29:36 -07:00
b5c88cd04e
Merge pull request #32504 from dongluochen/healthcheck_duration
...
do not allow duration less than 1 ms in healthcheck parameters
Upstream-commit: a7519152d9be7a0dd6941d529ea4b83cf4b7f1d4
Component: engine
2017-04-27 23:54:00 -04:00
d23cd74237
Merge pull request #32884 from albers/completion-system-df--format
...
Add bash completion for `system df --format`
Upstream-commit: 294c9eab56970fa0b106d20560ee1110ea478c5d
Component: engine
2017-04-27 15:10:17 -07:00
a9b3c829ba
Merge pull request #32889 from yuexiao-wang/fix-config
...
fix errors in config
Upstream-commit: dc329d38ad70bd0b21fe7c09d2615f38dfb520dc
Component: engine
2017-04-27 15:04:07 -07:00
a871092798
fix errors in config
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 25db82371eef40f54e1bd175ef72c479d368a798
Component: engine
2017-04-28 01:59:39 +08:00
0fd96c2554
Merge pull request #32717 from fcrisciani/data_path
...
Data path traffic separation option in swarm mode
Upstream-commit: 0307fe1a0bcdc02583a24add41eb783c117bad8c
Component: engine
2017-04-27 13:00:55 -04:00
c0b973c686
Add bash completion for system df --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 69a2ca0d4409911f9dc2c55cbb75fad908c717a3
Component: engine
2017-04-27 10:29:19 +02:00
182eb7ea78
Merge pull request #32802 from juliengk/docs_plugin_authz
...
Update legacy_plugins.md to include HBM authz plugin
Upstream-commit: d90fb13de717effaff70ffc466f913eb9b453e30
Component: engine
2017-04-26 23:09:47 -04:00
e7900cc574
Merge pull request #31557 from ripcurld0/add_stack_ls
...
Add the format option to the docker stack ls command
Upstream-commit: 6559abaf477352dc03725a70c85d0ea9c8d5974e
Component: engine
2017-04-26 19:13:33 -07:00
17438d5f4c
Inroduce SWARM --data-path-addr flag
...
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)
Negative test added for invalid flag arguments
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 8dc8cd4719f165c01c98e7d3ce1d6cea6a8f60b8
Component: engine
2017-04-26 15:33:15 -07:00
c057b8b3f4
Clarify where the RUN command runs from
...
Also, chained/quoted shell does not work
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com >
Upstream-commit: 3f6e861c14bf13bb5b43aacb9edfbb027d6b6903
Component: engine
2017-04-26 13:54:48 -04:00
76d9eb02b7
Add format to docker stack ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 205ec49de9c4f4abb8023d1ad36fdbc92e7ec294
Component: engine
2017-04-25 16:45:30 +03:00
7ee17f3128
Merge pull request #32470 from runcom/remove-init-client
...
remove --init-path from client
Upstream-commit: e1101b1295f05ef3c6f1a684a51cd508b3c7874c
Component: engine
2017-04-25 10:25:58 +02:00
84b16a2f43
Update legacy_plugins.md to include HBM authz plugin
...
Signed-off-by: Julien Kassar <github@kassisol.com >
Upstream-commit: 47367b21d5892c16dd69e6728574b91c72cc528b
Component: engine
2017-04-24 19:46:57 -04:00
66bc4368bf
Merge pull request #32723 from alvin319/master
...
Add examples of storage-opts and log-opts for the daemon
Upstream-commit: 80013fd59a19fa1ddccc7c3d879a4571806024c7
Component: engine
2017-04-21 20:41:45 -05:00
a4980cfd50
Update dockerd.md
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: 427a521b025afaa967c701e234f5366cc633cf77
Component: engine
2017-04-20 21:56:21 -05:00
63ddf44cbf
Add Moby Project logo
...
Signed-off-by: Solomon Hykes <solomon@docker.com >
Upstream-commit: d8413b86c09f643d970206ccd16fee35900da7bd
Component: engine
2017-04-20 17:03:21 -05:00
3ba3666c3a
Add examples of storage-opts and log-opts for the daemon
...
Signed-off-by: Alvin Deng <alvin.q.deng@utexas.edu >
Upstream-commit: c79bf50ba6cd68267f3d87f40dcd25167b750ea4
Component: engine
2017-04-19 16:35:47 -05:00
95052e2e30
Merge pull request #32645 from thaJeztah/minor-fixes-for-history-format
...
Minor fixups for history CLI reference
Upstream-commit: a9ff628a3c7c55cf016af88f37c4fb6a6029e17a
Component: engine
2017-04-16 23:59:49 +02:00
b07c419b5f
Fix markdown indentation level
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bda69e61427796b9631d61d61daf692177e95d06
Component: engine
2017-04-16 12:56:00 -05:00
59a197605b
Minor fixups for history CLI reference
...
This does some minor fix-ups in the CLI reference
for "history", and copies the formattting section to
the man-pages.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2e63c759a264cac09a37ff7f154014038289ca98
Component: engine
2017-04-16 12:51:29 -05:00
4489cc6ffc
Merge pull request #30962 from TheHipbot/30431-implement-format-for-history-with-docs
...
30431 implement format for history with docs
Upstream-commit: a3ab46361ee91dc99790e84369b4865572bd9f8c
Component: engine
2017-04-16 10:34:41 -07:00
7994679b80
update status code for network api
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 56dca8b676cee2781021cb1138f48d42ace415a4
Component: engine
2017-04-14 10:11:17 +08:00
e9836650c4
Merge pull request #31482 from ripcurld0/add_format_to_system_df
...
Add format to the docker system df command
Upstream-commit: 0b35ab196546a4de068060f10418cc5416d5b62c
Component: engine
2017-04-13 10:08:11 -07:00
2f0c087a4c
set 1ms as container duration minimum value
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: d8b6a35d0272d9bb121dda7d0bc53d0e53d8bd22
Component: engine
2017-04-12 15:45:29 -07:00
47f6ff572e
do not allow duration less than 1 ms in healthcheck parameters
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 5fc912d2c87c1986e830a7d4f6b62bec385e9a14
Component: engine
2017-04-12 10:48:31 -07:00
5f2d4821df
Merge pull request #32481 from yongtang/30740-docs-prune-label
...
Update docs of `label` filter for `docker system prune`
Upstream-commit: d0bd5aa2a7ad2561f067a0b9e470fc51ac2874a3
Component: engine
2017-04-12 15:37:04 +02:00
33f39daca5
Merge pull request #32544 from yuexiao-wang/fix-service-logs
...
Fix inconsistency for service logs
Upstream-commit: 18f90133ac4fe0b63745228c49eda441f6b91ecd
Component: engine
2017-04-12 09:51:15 +02:00
ac649e5b5e
Fix inconsisticy for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 78b2c1a84a3be4f0004ebd277d8a88eb0ac9d006
Component: engine
2017-04-12 22:43:14 +08:00
ba4754cea8
Merge pull request #32180 from joaofnfernandes/run-docs
...
Clean `docker run -e` reference docs
Upstream-commit: a0a977864f4160cca882bbe8cc72d944025f6fee
Component: engine
2017-04-12 09:34:30 +02:00
7c776ba71c
Clean docker run -e reference docs
...
Simplified the docs on how to set environment variables in a
container. Makes it clear that you have three options, and how
to use them.
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: d11c1520f4f4f2c2a3206343f573024b92c42bce
Component: engine
2017-04-11 15:03:31 -07:00
8df974860d
Update docs of label filter for docker system prune
...
This fix updates docs of `label` filter for `docker system prune`.
This fix is related to #30740 and #29999 , and specifically to comment
https://github.com/docker/docker/pull/30740#issuecomment-293012957 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5b0ab45a1ef2ce52e78851f49a8390263e642263
Component: engine
2017-04-11 12:08:55 -07:00
8915598c83
Merge pull request #32488 from dnephin/docs-for-dockerfile-stdin
...
Add docs for reading Dockerfile from stdin
Upstream-commit: 9d4a8cda6baa29ad22b4bd0f3c63392b73bde8a7
Component: engine
2017-04-11 20:46:14 +02:00
e5fb241134
bump API and version
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b507158c0f0c6cbee52d3ff7e0278004d3486c9d
Component: engine
2017-04-11 11:21:55 -07:00
670f141a55
Add docs for reading Dockerfile from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e838679cd7954775cbe7ff72ef2da02dbe791fcb
Component: engine
2017-04-11 11:40:10 -04:00
0e1fc8025c
Add Dockerfile reference docs for using ARG in FROM
...
Also fixed some examples of using `docker build` to clarify that the
positional argument is a directory, not a file.
Also fixed some terminology. Dockerfiles contain instructions, not directives or
commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3437715e20b3a1b16ea93a47802794b58b007863
Component: engine
2017-04-11 11:34:43 -04:00
26e209c931
Fix typo in version-history.md
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 269df77be24b0644a267f693a89ef4a794c62dd9
Component: engine
2017-04-11 15:39:01 +02:00
d2aa64e45c
Merge pull request #32284 from aaronlehmann/fix-service-defaults
...
Improve default handling for "service create"
Upstream-commit: a258ef58d8a100467d5d948b026a884ebe58eaf4
Component: engine
2017-04-11 13:06:53 +02:00
83aac6bdfe
Deprecate "asynchronous" service create and service update
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f32b90f4635bc6e822576c73a4afa90fded2cfc4
Component: engine
2017-04-11 12:18:02 +02:00
108aa4253e
Merge pull request #32462 from dperny/service-logs-general-availability
...
Remove experimental from service logs
Upstream-commit: 17a3e4511d8f20868a051f10dbedabdce7ea2f9c
Component: engine
2017-04-10 18:30:20 -07:00
9c833700c4
Merge pull request #32092 from alfred-landrum/gdcaps
...
Let graphdrivers declare diff stream fidelity
Upstream-commit: 74093fe4ca259c5378da89098c48fb7b1167732e
Component: engine
2017-04-10 18:20:32 -07:00
6516b7e3d8
Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels
...
stack rm should accept multiple arguments
Upstream-commit: 3a9572ca14c821ea0cf24dd590f608392e7a6ad1
Component: engine
2017-04-10 18:19:59 -07:00
a22988a573
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates
...
[17.04.x] deprecation and changelog updates
(cherry picked from commit f15f5937514c386ace40a43441dddc28337ca12d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9c2f8febaff2d61a30828db57bdef0064fac8e91
Component: engine
2017-04-11 00:57:37 +02:00
1dfd61e802
Make the CLI show defaults from the swarmkit defaults package
...
If no fields related to an update config or restart policy are
specified, these structs should not be created as part of the service,
to avoid hardcoding the current defaults.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: bbe1202410a580b8bdb35e7b50e4e4028e530111
Component: engine
2017-04-10 13:41:18 -07:00
24a0a6b6bb
Remove experimental from service logs
...
Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 306cfecc8c146ea8addb44dd35296808b25916a2
Component: engine
2017-04-10 13:40:45 -07:00
