Commit Graph

1929 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e5dfac43c9 Merge pull request #31148 from yongtang/31032-NanoCPU-update
Add `--cpus` support for `docker update`
Upstream-commit: 5b1cae227171a299e41835a4806cd939b984c596
Component: engine
2017-04-10 20:02:15 +02:00
6e350af41d remove --init-path from client
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a18d103b5ed4ed6ef95b2e4b582872a82022cceb
Component: engine
2017-04-10 16:49:43 +02:00
f8815ca306 Added word to documentation
Improved documentation by adding word for better sentence structure.

Signed-off-by: Mike Casas <mkcsas0@gmail.com>
Upstream-commit: eb6a3e8361dc48037ff3e29f5802bd21782cb645
Component: engine
2017-04-10 09:14:01 -04:00
b91fdec82e Merge pull request #32362 from tonistiigi/multi-stage-build-docs
Add docs for multi-stage builds
Upstream-commit: 2ba9783d1a50a519a42e69dbfa7b3b0755938a25
Component: engine
2017-04-10 14:26:08 +02:00
73fce35ed0 Merge pull request #32062 from aaronlehmann/change-network-attachments
Support service network attachment changes
Upstream-commit: b0831acb09662431ecfed84677e7f5ed54635d52
Component: engine
2017-04-10 12:49:28 +02:00
6633b439bb Add format to the docker system df command
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 985a9c7047616885454951e7c8282f3c94f6d6e9
Component: engine
2017-04-10 13:04:03 +03:00
88cdacca6c Add docs for named build stages
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 877ac98e44f2b1d9af6319ca07d232a3cd929d39
Component: engine
2017-04-09 20:40:50 -07:00
499e804f82 cli: Allow service's networks to be updated
Resolve networks IDs on the client side.

Avoid filling in deprecated Spec.Networks field.

Sort networks in the TaskSpec for update stability.

Add an integration test for changing service networks.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0f2669a63834844fb0ef5c017f517d8c321ad3c7
Component: engine
2017-04-07 16:46:25 -07:00
d557530da5 clarify docker plugin set docs
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a412ad41a59cbb892e4527b9d8fc835b237bb0e7
Component: engine
2017-04-07 16:35:05 -07:00
1623433ab1 Add support for update order
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.

This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
ba4f1c70ab Add --cpus support for docker update
This fix tries to address the issue raised in 31032 where it was
not possible to specify `--cpus` for `docker update`.

This fix adds `--cpus` support for `docker update`. In case both
`--cpus` and `--cpu-period/--cpu-quota` have been specified,
an error will be returned.

Related docs has been updated.

Integration tests have been added.

This fix fixes 31032.

This fix is related to 27921, 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 61022436926a8d0c92068e8116a2ad77f43eb6d6
Component: engine
2017-04-06 15:40:12 -07:00
e25f6c5a1b Added start period option to health check.
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
ed86f7c60d Merge pull request #32251 from AkihiroSuda/run-mount
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
2017-04-05 22:34:47 +02:00
19149ea4f2 Edits to CLI reference
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 6d3eecd8cf303f9f1588ef851e3bd8fe83fcbb8d
Component: engine
2017-04-05 11:27:09 -07:00
b214dc7ba1 stack rm should accept multiple arguments
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: ff0899ad2f9f94f541b45047798dbd469d72038a
Component: engine
2017-04-05 01:08:37 -04:00