docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
26,696 Commits 12 Branches 297 Tags
744ac1e4d5ebeb7fbc945328e92a77986cb76972
Commit Graph

25029 Commits

Author SHA1 Message Date
John Feminella
744ac1e4d5 Fix minor typo in "Docker Engine runs navitvely" 
Signed-off-by: John Feminella <jxf@jxf.me>
Upstream-commit: 435bc9d9898febc8b9c16a02e4114745a52374fc
Component: engine
 2016-08-22 15:43:26 -04:00
Brian Goff
17b771a0a4 Merge pull request #25889 from vdemeester/refactoring-reachable-lisibility 
Make reachable/unreachable condition more readable
Upstream-commit: 43640a890f7f271b5dbcdd076948171336635b21
Component: engine
 2016-08-22 11:10:03 -04:00
Vincent Demeester
968533071a Merge pull request #25899 from yuexiao-wang/fix-overview 
Optimize description for Feature highlights
Upstream-commit: d2fa978d4d66622a197eb98f9a77fa217e25f449
Component: engine
 2016-08-22 09:17:32 +02:00
Vincent Demeester
36f79775aa Merge pull request #25719 from eskaaren/master 
You can force leave swarm
Upstream-commit: daf454d8cd6146ef2cb644614301806ef59c58cc
Component: engine
 2016-08-22 09:15:37 +02:00
Vincent Demeester
536db7fdc5 Merge pull request #25775 from ddgenome/entrypoint-env 
Remove erroneous ENTRYPOINT note
Upstream-commit: c1bdda0be8616f987245cb61a4aedc09c8b5c806
Component: engine
 2016-08-22 09:13:54 +02:00
Sven Dowideit
c7c596011e Merge pull request #25835 from decoursin/patch-1 
Update apparmor error message
Upstream-commit: e168f0b4ad4dfc11a4423a6785d80153f0969808
Component: engine
 2016-08-22 15:47:23 +10:00
Sven Dowideit
bdc88f8035 Merge pull request #25901 from yuexiao-wang/add-content 
Add the content for how services work
Upstream-commit: abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5
Component: engine
 2016-08-22 11:58:30 +10:00
Antonio Murdaca
0f0bfaaffb Bump go to 1.7 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Component: engine
 2016-08-21 19:04:15 +02:00
Mihai Borobocea
84a03f36d0 docs: fix typo in url fragment 
I noticed the broken hyperlink in this page:
https://docs.docker.com/engine/reference/builder/
The link should point to `#parser-directives`.

Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
Upstream-commit: 441ecc459f0d08a930ee2d6f4502f24e2217e1fc
Component: engine
 2016-08-20 16:19:05 +03:00
yuexiao-wang
08af9769e8 Add the content for how services work 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 2b0892c02eb50c20e8752643faf558dd150dbc77
Component: engine
 2016-08-20 17:32:29 +08:00
yuexiao-wang
e22764bf9f Optimize description for Feature highlights 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: dde0f86a88989c02256a8b301ff8388752d88eed
Component: engine
 2016-08-20 16:24:18 +08:00
Vincent Demeester
3ab26843b3 Make reachable/unreachable condition more readable 
Introducing methods to make the intent of the condition clearer to the
eyes of the reader 👼.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 82a451bc94729b0dc2cc0ca94be60de70154f1c2
Component: engine
 2016-08-19 22:49:58 +02:00
Aaron Lehmann
cfba442486 Merge pull request #25867 from lixiaobing10051267/masterScheduler 
It is orchestrator not scheduler to create swarm task
Upstream-commit: ad37e303638dd37b3bf2eef8916e8e0376e2acce
Component: engine
 2016-08-19 13:27:12 -07:00
Vincent Demeester
e3afe81751 Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion 
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
 2016-08-19 22:09:57 +02:00
Sebastiaan van Stijn
034eb19e73 Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken 
Modify usage of docker swarm join-token command
Upstream-commit: 80798d28d36936f16fae4dd60af27cd08f54817c
Component: engine
 2016-08-19 21:44:42 +02:00
Alexander Morozov
7db773fe39 Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs 
ppc64le: add support for building docker debs for xenial
Upstream-commit: bf61c916ee12f2f1eda83bde7021e9bc4ee1ae15
Component: engine
 2016-08-19 08:35:31 -07:00
Sebastiaan van Stijn
5f54e81cc1 Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit 
Remove -run flag from commit command.
Upstream-commit: ec8f20cbf2edba00e645175675e8dca7c03b1350
Component: engine
 2016-08-19 15:19:23 +02:00
Sebastiaan van Stijn
cdca524947 Merge pull request #25799 from vdemeester/25313-integration-no-cover 
Disable coverage on test-integration-cli
Upstream-commit: d6c75c31387cd144d4bd08c9bc3191ade16ad8ea
Component: engine
 2016-08-19 14:31:24 +02:00
Nick DeCoursin
4dc1ced56e Update apparmor error message 
Signed-off-by: decoursin <n.decoursin@foodpanda.com>
Upstream-commit: ae4ad3d955ffd5c31b3103914318dbfa49c17e9c
Component: engine
 2016-08-19 14:22:27 +02:00
Vincent Demeester
ac9a57031e Remove -run flag from commit command. 
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 54ed156879352afb06ecb94fa7b6518a39eb5fd2
Component: engine
 2016-08-19 13:14:03 +02:00
lixiaobing10051267
48a77b1711 It is orchestrator not scheduler to create swarm task 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: cb9dfd391ba4df5c34f83f5070e0b685c99bf591
Component: engine
 2016-08-19 17:02:00 +08:00
Christopher Jones
c49a123086 ppc64le: add support for building docker debs for xenial 
This PR adds the ability to make docker debs for xenial on power

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 64881dc331f1f0ff861eb82bb05eef63d6693a67
Component: engine
 2016-08-18 22:25:14 -04:00
lixiaobing10051267
715ba2d5b3 Modify usage of docker swarm join-token command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 9123ca546a49f6738a918b89ba7a41963083be54
Component: engine
 2016-08-19 09:44:22 +08:00
Yong Tang
d30cc14f93 Update zsh and bash completion scripts. 
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7fd2c809622e66bb3157fbf1ab797152636a2df5
Component: engine
 2016-08-18 18:41:15 -07:00
Yong Tang
a603b90d7f Add --force in docker volume rm to fix out-of-band volume driver deletion 
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).

This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.

Related documentations have been updated.

This fix is tested manually with flocker, as is specified in #23367.
An integration test has also been added for the scenario described.

This fix fixes #23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6c5c34d50d377d1c5318a255240fb2dc9c23cf92
Component: engine
 2016-08-18 18:01:25 -07:00
Brian Goff
966bd9ff19 Use the correct version of glide 
In `man/Dockerfile` we are specifying a tagged version of glide to
checkout, but never actually checking it out.
This checks out the requested version before building.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ce312a910c275da854880e1746332cae7d82e9df
Component: engine
 2016-08-18 20:43:50 -04:00
Brian Goff
cd9d633b0a Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim 
Vendor hcsshim to v0.4.2
Upstream-commit: 09e1de2080fd3b0bafb38adbd4b8c12ee949794d
Component: engine
 2016-08-18 17:21:02 -04:00
Brian Goff
df9fd6f3a4 Merge pull request #25841 from anusha-ragunathan/vendor-dist 
Vendor distribution changes.
Upstream-commit: 5b6063c83701d962325e16bec15a0cecb154e15d
Component: engine
 2016-08-18 17:20:03 -04:00
Vincent Demeester
75edb24b6f Disable coverage on test-integration-cli 
Temporarly remove cover bundle from defaults.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5ec6e11e157b94d56bc2d7aa8e94cf7e72f51871
Component: engine
 2016-08-18 22:12:24 +02:00
Doug Davis
db8cc1fdde Merge pull request #24978 from yongtang/24912-build-with-progress 
Add hint of progress to the output of `docker build`
Upstream-commit: 282b0aff08030a2521adf7d64bdd333f0864b720
Component: engine
 2016-08-18 16:10:48 -04:00
Vincent Demeester
9ab2ca7546 Merge pull request #25708 from timfeirg/master 
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
 2016-08-18 21:54:48 +02:00
Darren Stahl
c7c2901b56 Vendor hcsshim to v0.4.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ba54581c3d4e388586100c53ee705eaac3c2201c
Component: engine
 2016-08-18 12:53:01 -07:00
Tibor Vass
98b77062ae Merge 1.12.1 CHANGELOG to master 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3b05e95d98daf1d8d278d7b343add205a0b8382e
Component: engine
 2016-08-18 11:35:44 -07:00
Tõnis Tiigi
f1f995a052 Merge pull request #25839 from cpuguy83/add_comments 
Add requested comments about old buggy behavior
Upstream-commit: 923053d1edac552a8d48cbb293c4ec935a93348b
Component: engine
 2016-08-18 10:31:37 -07:00
Sebastiaan van Stijn
9ad4bec0bc Merge pull request #25743 from lixiaobing10051267/masterInspect 
Check the return message of docker service inspect
Upstream-commit: 6fa69d2d0610320cce61517eca6e4471f5381561
Component: engine
 2016-08-18 19:25:08 +02:00
Anusha Ragunathan
389d0f753e Vendor distribution changes. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 764d97444eb1ff41207a99b291346819ad1f51cd
Component: engine
 2016-08-18 09:30:31 -07:00
Sebastiaan van Stijn
9c61498be3 Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
 2016-08-18 17:20:09 +02:00
Sebastiaan van Stijn
c48cb27659 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave 
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
 2016-08-18 17:08:41 +02:00
Sebastiaan van Stijn
9ebd97c86d Merge pull request #25812 from johananl/patch-1 
Update device-mapper-driver.md
Upstream-commit: 840a1982803425d67d9c29acbed0d16ecaa6e4ed
Component: engine
 2016-08-18 17:08:14 +02:00
Brian Goff
2c45777add Add requested comments about old buggy behavior 
Address comment: 246d1eb58e (r75242138)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c7075bd14949bae1ec938118ee96e4f1c9830b41
Component: engine
 2016-08-18 10:07:22 -04:00
Vincent Demeester
02f084e00a Merge pull request #25815 from justincormack/capdoc 
Split list of capabilities into those added by default and those not
Upstream-commit: d854c4fcc6255330693eee67b655606e92b11544
Component: engine
 2016-08-18 15:26:59 +02:00
Vincent Demeester
46a42da7e0 Merge pull request #25785 from WeiZhang555/fix-flaky-external-volume-driver 
bugfix: report "destroy" after all volumes of container destroy
Upstream-commit: 3cebff8b869d2720b12618ef5bff22fa4f0fd4a6
Component: engine
 2016-08-18 09:58:54 +02:00
timfeirg
c8732c07e1 expose RemovalInProgress in StateString #25652 
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
 2016-08-18 11:25:27 +08:00
Tibor Vass
742fa26537 Merge pull request #25825 from cpuguy83/25821_fix_nil_opts 
Fix volume not working after daemon restart
Upstream-commit: 1b954973cce64e42b440ff63fa998593f3e499e9
Component: engine
 2016-08-17 20:15:34 -07:00
lixiaobing10051267
a87ab137b8 Specify woker node for docker swarm leave command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fd660e21bf6568c3f98424bdff3b9672cd2a3ef8
Component: engine
 2016-08-18 09:35:11 +08:00
Brian Goff
69cd6761bb Fix volume not working after daemon restart 
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.

In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.

Ensures 2 things:

1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.

2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 246d1eb58e807f2cf2d2b387e267dcfa228f96a8
Component: engine
 2016-08-17 20:36:17 -04:00
John Howard
f5ce997d75 Fix minor typo 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d56c2ea9edf0a6f5abfb5be8d241ecf8375054ff
Component: engine
 2016-08-17 16:10:01 -07:00
Justin Cormack
92992ea84a Merge pull request #25801 from thaJeztah/improve-volume-validation-message 
improve error message for volume names that are too short
Upstream-commit: b0b3249bc2265dcb7a290501dcc93c65f9265848
Component: engine
 2016-08-17 23:33:08 +01:00
Alexander Morozov
02f0dc9ea5 Merge pull request #25808 from justincormack/parallel-tests 
Run seccomp tests in series not parallel
Upstream-commit: a1fece68211826386612ba16526543ba052a46dd
Component: engine
 2016-08-17 14:50:24 -07:00
Justin Cormack
3a9b1e9ecd Split list of capabilities into those added by default and those not 
The documentation was a bit unhelpful as to what are the default
capabilities, so split.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: bf7a3f010443ecd614baf0450c3193b1f5e52bc2
Component: engine
 2016-08-17 21:16:54 +01:00