1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

1822 Commits

Author SHA1 Message Date
Tibor Vass
b5523cf68f Merge pull request #30514 from FrenchBen/yaml
Yaml Generation
Upstream-commit: b5bd023de6a8a57214539331727e7b9bcbf8e341
Component: engine
2017-03-15 16:20:33 -07:00
Sebastiaan van Stijn
886c21a61b Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference
docs: remove outdated reference to updating /etc/hosts
Upstream-commit: 5126862d438eb7ad6fd2e9591a830d1c92d91ea8
Component: engine
2017-03-15 14:07:01 +01:00
Sebastiaan van Stijn
b039776e6b docs: remove outdated reference to updating /etc/hosts
Starting with docker 1.10, docker no longer uses
/etc/hosts for service discovery, but uses an
embedded DNS server. This patch removes a reference
to the old (pre 1.10) behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 171f5d84f908056353d5cd138d13de1636447d68
Component: engine
2017-03-15 12:27:23 +01:00
French Ben
b0ff606238 docs: added support for CLI yaml file generation
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5443f0152f77eb983e6475474b02c2e11d975f1c
Component: engine
2017-03-14 16:04:08 -07:00
Daniel Nephin
6a9291e20f Add --prune to stack deploy.
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 644fd804fce63499812259331b0a9f2a4a3ebcc4
Component: engine
2017-03-14 16:09:28 -04:00
Harald Albers
8dd6a42039 Remove docs for dockerd --no-new-privileges
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0a1ace9d2f72f3e3c20e8ddad2407ba7145e3db5
Component: engine
2017-03-14 10:00:14 +01:00
Madhu Venugopal
95794e3edc Merge pull request #31710 from sanimej/drillerrr
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
Santhosh Manohar
ff11389227 Enhance network inspect to show all tasks, local & non-local, in swarm mode
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
2017-03-13 17:52:08 -07:00
Tibor Vass
77daab9192 Merge pull request #31767 from mstanleyjones/fix_tables
Fix markdown in references for Kramdown
Upstream-commit: f947d823f0b05655d1d6b99920dcc3ac54766a97
Component: engine
2017-03-13 14:13:15 -07:00
Vincent Demeester
85b9c9f55a Merge pull request #31712 from rcjsuen/patch-2
Fix directive example to match description
Upstream-commit: 4744b01d3bfcb5cfe320bb239894cb6b67165245
Component: engine
2017-03-13 16:34:29 +01:00
Misty Stanley-Jones
8d8d9c4abd Fix markdown in references for Kramdown
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 0ce13eb0d343e81db7006fd9c3e0c95ee1c3925c
Component: engine
2017-03-12 12:01:06 -07:00
Remy Suen
6b69c9da09 Fix directive example to match description
The description claims the directive is appearing after a comment but
the sample Dockerfile has the directive appear after an instruction.
Changed the ordering of the lines to match the example's description.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Upstream-commit: f00fa639881a9ef2ab2959f11fa30554396a3dac
Component: engine
2017-03-10 07:11:30 +09:00
John Laswell
6aba7fbe3b Fix typo in run.md documentation
Signed-off-by: John Laswell <john.n.laswell@gmail.com>
Upstream-commit: 4a20252137902100a8a01dd86c698e49dc00e8b2
Component: engine
2017-03-09 13:08:48 -05:00
Harald Albers
0d16f73693 Fix description of docker run|create --stop-signal in help message
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
2017-03-09 09:32:16 +01:00
Aaron Lehmann
ac66308e6c Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3a88a24d23e6eb1ca521cd9ab6e306d4ba1c1464
Component: engine
2017-03-03 16:33:34 -08:00
Aaron Lehmann
0c390668f1 Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cc9d04647a68cf49e66bf26f10908387b99dae1a
Component: engine
2017-03-03 16:33:34 -08:00
Sebastiaan van Stijn
d4d27bb5d4 Merge pull request #30725 from aaronlehmann/topology
Topology-aware scheduling
Upstream-commit: 3a5a1c3f3d1638c35891ee630ba20eda0bef560f
Component: engine
2017-03-03 15:01:12 +01:00
Sebastiaan van Stijn
948c24d8aa remove Jekyll tags from CLI reference
These Markdown files are now embedded in a YAML
file for templating in the documentation, and
these special markers are no longer needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7e3169f26d4600691de9698598a2e5a064ea85eb
Component: engine
2017-03-02 02:14:15 +01:00
Sebastiaan van Stijn
13f20b59db Merge pull request #30754 from yongtang/25696-stop-signal
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: bb9f19503cbb0153a0da01b1e91691cd63f48dd9
Component: engine
2017-03-01 18:10:57 +01:00
pjaffe
2fe0398b28 Remove incorrect duplicate phrase from build.md
A phrase from the "Text files" section in build.md was incorrectly duplicated under the "Tarball contexts" section.

Signed-off-by: Peter Jaffe <pjaffe@nevo.com>
Upstream-commit: 76235635753fd37e8f94ecc01088a12dc550d2e1
Component: engine
2017-02-27 17:05:24 -05:00
Aaron Lehmann
737f03c444 Topology-aware scheduling
This adds support for placement preferences in Swarm services.

- Convert PlacementPreferences between GRPC API and HTTP API
- Add --placement-pref, --placement-pref-add and --placement-pref-rm to CLI
- Add support for placement preferences in service inspect --pretty
- Add integration test

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 17288c611a4f3f75ecb3bbb4533820b1836c55a6
Component: engine
2017-02-27 13:29:54 -08:00
Sebastiaan van Stijn
12aa0347d6 Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
2017-02-27 12:42:18 +01:00
Brian Goff
38c03e66d8 Merge pull request #31291 from albers/docs-daemon-hosts
Clarify why `hosts` in `daemon.json` does not work
Upstream-commit: 27c9a6e9c22a6cf0c6dae7f59cf8f7d56a67f560
Component: engine
2017-02-23 10:47:26 -05:00
Harald Albers
6e26e75ead Clarify why hosts in daemon.json does not work
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 340b75dd41d026e6f6072da851930d6802a1ee34
Component: engine
2017-02-23 14:03:58 +01:00
yupengzte
718b046537 Delete dots to align with other commands description
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: ec95ad7353b240542f73076dde975e392c281748
Component: engine
2017-02-23 16:46:08 +08:00
Vincent Demeester
79d868fec9 Merge pull request #31031 from WeiZhang555/stats-all-docs
[Docs] Add docs for stating stopped containers
Upstream-commit: 4534dcd494979ea89d8243002fb478857e25032d
Component: engine
2017-02-22 11:14:15 +01:00
Yong Tang
5050030ffa Add --stop-signal for service create and service update
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.

This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 25696.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c2d49ec214649b0025f7060429334893350fbaee
Component: engine
2017-02-21 15:19:45 -08:00
Sebastiaan van Stijn
301cc805aa Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
2017-02-21 00:59:58 +01:00
Tony Abboud
7dba33b4e7 Add --add-host for docker build
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: 7a962e4577628c357f96153eca07e527813fb42b
Component: engine
2017-02-20 17:32:28 -05:00
Vincent Demeester
c4ca316177 Merge pull request #31034 from erxian/refine-service-update-document
add rollback explanation to docker service update command document
Upstream-commit: 75843d36aa5c3eaade50da005f9e0ff2602f3d5e
Component: engine
2017-02-20 09:29:38 +01:00
erxian
07ac2fb3ec add rollback explanation to docker service update command document
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 34919accaa1f43fce17398aa82430cfe5883ea2f
Component: engine
2017-02-20 11:37:07 +08:00
Anusha Ragunathan
00a09015ca Merge pull request #29984 from jmzwcn/issueNNP
[feature]: add daemon flag to set no_new_priv as default for unprivileged containers
Upstream-commit: 6dd2a82458016d15786b0bb12ba4cecde9b6bb90
Component: engine
2017-02-17 11:43:43 -08:00
Anusha Ragunathan
b7f72f988d Merge pull request #28213 from yongtang/11062016-service-ps-format
Add `--format` to `docker service ps`
Upstream-commit: b1debf1374ca7be7e7b4d4fcd41eceaf8b7cf153
Component: engine
2017-02-17 10:23:18 -08:00
Brian Goff
c5276a2bfc Merge pull request #30679 from mlaventure/cgroup-devices-docs
Add example for --device-cgroup-rule to create reference
Upstream-commit: 623612fe09b72a907269a7d7fca94f7aeda1747c
Component: engine
2017-02-16 21:18:04 -05:00
Daniel Zhang
3ba3328157 Add daemon flag to set no_new_priv as default for unprivileged containers.
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: d7fda019bb7e24f42f8ae1ddecb3fd52df3c48bf
Component: engine
2017-02-16 19:05:14 +08:00
Zhang Wei
fea229adb1 [Docs] Add docs for stating stopped containers
This commit adds docs with example showing `docker stats` stopped
containers.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7a36d55a86e5d443f1de5b7b32d710cc65671a92
Component: engine
2017-02-15 14:20:30 +08:00
yupengzte
a532e48c46 fix the type
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: d735972d3150fa4e286ce468f033156fa22fddb7
Component: engine
2017-02-14 09:54:27 +08:00
Tianon Gravi
ec2663feb9 Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 52379fa76dee07ca038624d639d9e14f4fb719ff
Component: engine
2017-02-13 11:01:54 -08:00
yupengzte
4d0e710fd3 fix typo
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 266107f301b8d470f6ff67da41960fccf9e1a4ba
Component: engine
2017-02-13 15:47:38 +08:00
Yong Tang
08e260c901 Add --format to docker service ps
This fix tries to address the issue raised in 27189 where
it is not possible to support configured formatting stored in
config.json.

Since `--format` was not supported in `docker service ps`,
the flag `--format` has also been added in this fix.

This fix
1. Add `--format` to `docker service ps`
2. Add `tasksFormat` to config.json
3. Add `--format` to `docker stack ps`
4. Add `--format` to `docker node ps`

The related docs has been updated.

An integration test has been added.

This fix fixes 27189.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f8c7c921d905615acf1d2c6577ae1cfb4600bec0
Component: engine
2017-02-10 16:53:04 -08:00
Misty Stanley-Jones
796599868e Merge pull request #29559 from mstanleyjones/define_bridge
Define bridge networks
Upstream-commit: c621fbce04ec845d5f9254bc59b11dfe06fff0e0
Component: engine
2017-02-10 09:25:29 -08:00
Brian Goff
99d3239faa Merge pull request #30702 from allencloud/update-api-docs-about-filters
add missing filter type in swagger.yml and sort filter type in alphabets
Upstream-commit: 10c0af083544460a2ddc2218f37dc24a077f7d90
Component: engine
2017-02-09 10:33:49 -05:00
Misty Stanley-Jones
7196026b57 Standardized formatting of CLI reference commands
Command name should be a H1

Only Description, Examples, and Related Commands should be H2

Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands

Added some examples where relevant

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 52df69f00d966904ba230dc2e3a0646cc52b7688
Component: engine
2017-02-08 16:57:58 -08:00
Misty Stanley-Jones
1ecb43d9ed Removed unused image
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 80ee21e533e6c88dcdc293d5e88b330f777acee2
Component: engine
2017-02-08 16:38:31 -08:00
Misty Stanley-Jones
6966820198 Add info about the relationship between swarm leave and node rm
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: e2ce8703711b5b07e60eb5e09c18214a74b6d041
Component: engine
2017-02-08 16:38:31 -08:00
Sebastiaan van Stijn
5b20abeadf Merge pull request #29906 from allencloud/update-events-related-things
update events related doc and swagger.yml
Upstream-commit: dea528e8cd044de6ca08f7c9bb2e7581774743d6
Component: engine
2017-02-08 14:13:37 -08:00
Misty Stanley-Jones
e0d975b4ca Define bridge networks
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 1e74df3637c1497f7adc3bd7aebd95baaa4c8e22
Component: engine
2017-02-08 13:33:34 -08:00
Misty Stanley-Jones
fcde483797 Merge pull request #30523 from nathanleclaire/document_init
Document --init flag for docker run
Upstream-commit: e0cc664cc34959b301849378f3e98146b079fc5e
Component: engine
2017-02-07 09:28:30 -08:00
Aaron Lehmann
48134e2cad Fix grammatical error in swarm_leave.md
Correct this sentence so it reads correctly. "to on a manager" should be
"on a manager".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 248b1c23d37e1e32af66583f8d14d9f8742280ef
Component: engine
2017-02-06 17:31:55 -08:00
allencloud
fe36f50059 add expose and publish filter in swagger.yml and CLI docs for docker/master
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 44bd658913647ddadc3c225233c08ee61ef3c5ed
Component: engine
2017-02-04 14:28:14 +08:00