Arash Deshmeh
7435e1c862
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5cc1f9006a
Component: cli
2018-08-08 12:20:21 -04:00
Arash Deshmeh
73b3c56c30
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 04bb3c770f
Component: cli
2018-08-08 12:20:10 -04:00
Arash Deshmeh
21c2c41660
use sortorder lib for sorting network list output
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a921313caf
Component: cli
2018-08-08 12:06:59 -04:00
Kazuhiro Sera
71a3e53c36
Fix the several typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com >
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
2018-08-09 00:45:00 +09:00
Tibor Vass
9e965fad85
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
...
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.
In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: faeb8bb571
Component: cli
2018-08-07 18:18:13 +00:00
GordonTheTurtle
5f75afe983
Merge branch 'master' of github.com:docker/docker-ce
2018-08-07 17:03:38 +00:00
GordonTheTurtle
53e0010b72
Merge component 'cli' from git@github.com:docker/cli master
2018-08-07 16:37:00 +00:00
GordonTheTurtle
ad843ef36b
Merge component 'cli' from git@github.com:docker/cli master
2018-08-07 16:32:36 +00:00
Sebastiaan van Stijn
d098202034
Merge pull request #1277 from vdemeester/template-subtests-followup
...
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
Component: cli
2018-08-07 16:30:11 +02:00
Vincent Demeester
68e01b8ab7
Migrate TestExtractVariables to subtests…
...
… as suggested in previous PR comment.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9cd7c1361c
Component: cli
2018-08-07 16:06:13 +02:00
Ximo Guanter Gonzálbez
a18736f217
Fix #28814
...
Signed-off-by: Ximo Guanter Gonzálbez <joaquin.guantergonzalbez@telefonica.com >
Upstream-commit: ea65a0b1349b532e9d10d63835c751d291a7c0f4
Component: engine
2018-08-07 10:20:13 +02:00
Tibor Vass
a3a5617ab6
builder: fix compilation errors after vendoring
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
2018-08-07 06:03:10 +00:00
Derek McGowan
084e7423dc
libcontainerd: split client and supervisor
...
Adds a supervisor package for starting and monitoring containerd.
Separates grpc connection allowing access from daemon.
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: dd2e19ebd58cd8896d79b4b8db61144b93717b33
Component: engine
2018-08-06 10:23:04 -07:00
GordonTheTurtle
77d0975ce7
Merge component 'engine' from git@github.com:docker/engine master
2018-08-05 17:02:36 +00:00
Yong Tang
c811febb3c
Merge pull request #37586 from thaJeztah/bump_swarmkit
...
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Upstream-commit: f57f260b49b6142366e6bc1274204ee0a1205945
Component: engine
2018-08-05 09:11:58 -07:00
GordonTheTurtle
7e95203d7f
Merge component 'engine' from git@github.com:docker/engine master
2018-08-04 01:01:42 +00:00
GordonTheTurtle
4706b6f33a
Merge component 'cli' from git@github.com:docker/cli master
2018-08-04 00:36:35 +00:00
Sebastiaan van Stijn
c213d85ec3
Merge pull request #1271 from albers/completion-shellcheck
...
Fix shellcheck warnings
Upstream-commit: b5768bea9b
Component: cli
2018-08-04 01:36:36 +02:00
Sebastiaan van Stijn
6d14e4f6a2
Merge pull request #1269 from albers/completion-cp--archive
...
Add bash completion for `cp --archive`
Upstream-commit: e8cd06c8eb
Component: cli
2018-08-03 23:48:52 +02:00
Harald Albers
22b9c5ed2c
Merge pull request #1270 from Ace-Tang/master
...
bash completion: fix uncorrect completion
Upstream-commit: ad28cec012
Component: cli
2018-08-03 23:26:09 +02:00
Sebastiaan van Stijn
baf9cf6d1a
Merge pull request #37583 from Microsoft/jjh.37562
...
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
Upstream-commit: eeea12db7a65e6ad633747e49928c80b0f18d86b
Component: engine
2018-08-03 22:05:06 +02:00
Sebastiaan van Stijn
a972373b51
Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
...
Relevant changes;
- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
2018-08-03 18:55:53 +02:00
Harald Albers
73443cfafe
Fix shellcheck warnings
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e587ec293b
Component: cli
2018-08-03 15:28:09 +02:00
Ace-Tang
1dfbd7519a
bash completion: fix uncorrect completion
...
fix uncorrect completion for command
docker docker <tab>
Signed-off-by: Ace-Tang <aceapril@126.com >
Upstream-commit: 7b4e2f3145
Component: cli
2018-08-03 21:27:27 +08:00
Harald Albers
13b26eee62
Add bash completion for cp --archive
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b9b3754ad3
Component: cli
2018-08-03 14:30:30 +02:00
John Howard
295ddc5339
Don't invoke HCS shutdown if terminate called
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5cfededc7ca552260f8eb7319184437a816e480d
Component: engine
2018-08-02 16:29:37 -07:00
GordonTheTurtle
851e1e2005
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 20:36:49 +00:00
Sebastiaan van Stijn
f92453678a
Merge pull request #1259 from adshmh/add-unit-test-to-cover-network-list-sort
...
Add unit test to cover network list sort, refactor to table-driven tests
Upstream-commit: e902ae9f84
Component: cli
2018-08-02 20:28:53 +02:00
Andrew Hsu
4658043fcf
vndr buildkit to e57eed4 and fsutil to b19464c
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 67da8c84b66a79261032478637b26c5baa3908b4
Component: engine
2018-08-02 18:19:13 +00:00
Arash Deshmeh
115f23480e
refactor network list unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 021bf39d76
Component: cli
2018-08-02 14:07:06 -04:00
Arash Deshmeh
d4fe2b6044
add unit test to cover the sort order of network list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 4f388ffca3
Component: cli
2018-08-02 14:07:06 -04:00
GordonTheTurtle
cd93f23d9c
Merge component 'engine' from git@github.com:docker/engine master
2018-08-02 17:02:15 +00:00
GordonTheTurtle
1ae49cf365
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 16:36:50 +00:00
Sebastiaan van Stijn
a727cc8ee8
Merge pull request #1262 from vdemeester/allow-custom-pattern
...
Allow custom pattern when extracting variable…
Upstream-commit: ff1a34d9a9
Component: cli
2018-08-02 18:00:38 +02:00
Sebastiaan van Stijn
c1168064aa
Merge pull request #1254 from albers/completion-kubernetes
...
Add bash completion for kubernetes orchestrator
Upstream-commit: 731b4f1fb4
Component: cli
2018-08-02 17:30:31 +02:00
Vincent Demeester
4cbdb398d7
Allow custom pattern when extracting variable…
...
… as it is possible to do it when interpolating. It also fixes when
there is 2 variables on the same *value* (in the composefile, on the
same line)
Finaly, renaming the default, used in cli, pattern to `defaultPattern`
to not be shadowed unintentionally.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4c87725c35
Component: cli
2018-08-02 16:50:40 +02:00
Sebastiaan van Stijn
e08a81b044
Merge pull request #37541 from yongtang/07282018-ipc-container
...
Migrate some ipc container test from integration-cli to integration
Upstream-commit: 75fe41444009947d319f76e68b5e1f2124c79b4d
Component: engine
2018-08-02 15:51:25 +02:00
GordonTheTurtle
f2b2ca3774
Merge component 'cli' from git@github.com:docker/cli master
2018-08-02 12:36:56 +00:00
Harald Albers
841a592280
Add bash completion for kubernetes orchestrator
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 08f8ee1320
Component: cli
2018-08-02 13:54:31 +02:00
Harald Albers
907c1bdfa8
Only complete swarm specific options with orchestrator=swarm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8ef01e869e
Component: cli
2018-08-02 13:54:31 +02:00
Harald Albers
19734fb410
Add support for orchestrator specific bash completions
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ff953751d3
Component: cli
2018-08-02 13:54:31 +02:00
Sebastiaan van Stijn
5f6d6806ac
Merge pull request #1251 from silvin-lubecki/fix-stack-help-command
...
Fix help message flags on docker stack commands and sub-commands
Upstream-commit: 4fbb009d39
Component: cli
2018-08-02 13:10:36 +02:00
Akihiro Suda
4a36f11243
support SSH connection
...
e.g. docker -H ssh://me@server
The `docker` CLI also needs to be installed on the remote host to
provide `docker system dial-stdio`, which proxies the daemon socket to stdio.
Please refer to docs/reference/commandline/dockerd.md .
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 6f61cf053a
Component: cli
2018-08-02 13:10:06 +09:00
GordonTheTurtle
66b7137cbd
Merge component 'engine' from git@github.com:docker/engine master
2018-08-02 01:02:21 +00:00
Yong Tang
a055aa9d40
Migrate some ipc container test from integration-cli to integration
...
This fix migrates some ipc container tests from integration-cli
to integration test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 80c92c9b692b79273200b6e37f14a6d4e984ab8d
Component: engine
2018-08-01 21:51:45 +00:00
Sebastiaan van Stijn
f4ebc73a60
Merge pull request #37465 from Russtopia/master
...
namesgenerator: new adjective, two inspiring Computing Science authors
Upstream-commit: 09f5e9dae3b83ee9eaa09b8097134d5d4251fce8
Component: engine
2018-08-01 23:50:05 +02:00
GordonTheTurtle
6e92e59096
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-08-01 21:04:19 +00:00
GordonTheTurtle
ff8bdfb5f9
Merge component 'engine' from git@github.com:docker/engine master
2018-08-01 21:04:10 +00:00
Tibor Vass
1e5cba450a
Merge pull request #37489 from poizan42/fix-mips-no-pie
...
-buildmode=pie is not supported on Linux on MIPS either
Upstream-commit: 724c5f317e0aabb3fb95933e5dd95ab9d71b5cdb
Component: engine
2018-08-01 10:39:55 -07:00
docker-unir[bot]
7359851606
Merge pull request #126 from dhiltgen/image_build
...
Merged with https://github.com/seemethere/unir
Upstream-commit: 1aa29931980e51171a57cae931de9cd17966dbb0
Component: packaging
2018-08-01 17:28:21 +00:00