toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,985 Commits 3 Branches 295 Tags
b03700a5d5b2d10c757010af162100430abbd7cd
Commit Graph
26985 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lixiaobing10051267 7eccfab5d7 Incorrect response field name for command "docker images" 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 8eae3ceab8acbbd5b842f642bd12377bec4b5606
Component: engine
 2016-08-23 14:24:31 +08:00
Neyazul Haque 2f475c1229 Change TMPDIR to DOCKER_TMPDIR 
TMPDIR was changed to DOCKER_TMPDIR in pull request 7113 but the file still asks user to set TMPDIR.
I am new to docker and wasted sometime this morning because of this.
I am using docker version 1.12.1 on ubuntu server 14.04

Signed-off-by: Neyazul Haque <nuhaque@gmail.com>
Upstream-commit: 10cebd4c741cd9e0762227148795c4ce02317579
Component: engine
 2016-08-23 08:45:46 +05:30
Doug Davis 6d0358a080 Merge pull request #25931 from fj/patch-1 
Fix minor typo in "Getting Started" documentation
Upstream-commit: a949a79a5899df2b57c0ff3e6a3e9aa432db248c
Component: engine
 2016-08-22 21:53:47 -05:00
Alexander Morozov 6aa95ab9d1 Merge pull request #25833 from tonistiigi/update-swarmkit 
vendor: update swarmkit to 8a761950f
Upstream-commit: 251bc2bcd74b5899c77a620870d08e6820c4047e
Component: engine
 2016-08-22 19:36:44 -07:00
Lei Jitang 1003bf4b18 Fix inspect Dead container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c35186b0b906dbda224d94c37794022762fcb374
Component: engine
 2016-08-22 22:09:25 -04:00
YuPengZTE 4d10a59191 It is better to add "\n" in printf 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 9b015bd4fd7716243564250ada0e3797c0f29fcb
Component: engine
 2016-08-23 09:01:25 +08:00
David Trott c24691321a Added the word "container" to clarify the error message. 
Signed-off-by: David Trott <github@davidtrott.com>
Upstream-commit: c9d0a77657ccc3be144ed4de12d43c8cfcca8590
Component: engine
 2016-08-22 13:41:17 -07:00
Aaron Lehmann 9ccbe410f0 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager 
Remove option "--manager" description for swarm_join.md
Upstream-commit: 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259
Component: engine
 2016-08-22 13:13:21 -07:00
Alexander Morozov c2e95ee295 Merge pull request #25824 from dmcgowan/overlay2-make-faster 
Avoid fork on mount for overlay2 in common case
Upstream-commit: 2e1a5942374fac33b2b2546e2779f1475693844f
Component: engine
 2016-08-22 13:02:22 -07:00
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
Derek McGowan 670946bf76 Avoid fork on mount for overlay2 in common case 
In the common case where the user is using /var/lib/docker and
an image with less than 60 layers, forking is not needed. Calculate
whether absolute paths can be used and avoid forking to mount in
those cases.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: c13a985fa1196a5ed782d5ac68a4bbb68dd529ca
Component: engine
 2016-08-22 11:43:10 -07:00
Tonis Tiigi 32e409f5b7 Update executor changes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 96a27cf0931974b602acfdd74dfcc5142500c7ba
Component: engine
 2016-08-22 11:36:20 -07:00
Tonis Tiigi d90e537965 vendor: update swarmkit in 8a761950f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee030251f28a50d96634d58bc6396382c29a4281
Component: engine
 2016-08-22 11:36:06 -07:00
Aaron Lehmann 4a7de16b5f Merge pull request #25582 from anusha-ragunathan/detect-plugin-mediatype 
Make `docker pull` detect plugin content and error out.
Upstream-commit: 3b374a25f2ded96ce46dccaabd1ce3aa50e401c0
Component: engine
 2016-08-22 09:29:51 -07:00
Brian Goff c0e81b448f Merge pull request #25869 from cjdmax/master 
debian sysvinitscript one missed DOCKER->DOCKERD change
Upstream-commit: 2fb2bbe4079e3b278e0a15510475c4c1b5f9ecd6
Component: engine
 2016-08-22 12:24:31 -04:00
Brian Goff daeb1250d3 Merge pull request #25872 from coolljt0725/fix_25870 
Persist pause state to disk to support container live restore
Upstream-commit: 374caa98d8a1aac01478c1d9b69f9cf13874f1b3
Component: engine
 2016-08-22 12:18:01 -04:00
Brian Goff be4d8fd4f5 Merge pull request #25881 from justincormack/aarch64-manpages 
Add a Dockerfile for generating manpages on aarch64
Upstream-commit: d3b0064d4af29776f12f73ad89d623b0e21a5979
Component: engine
 2016-08-22 12:16:09 -04:00
Anusha Ragunathan cb628977aa Add spec file support for Windows plugin discovery. 
Plugin discovery on Windows is not possible using named pipes. However,
it is possible using spec file (tcp based). This adds Windows specific
paths for discovery.

Fixes #23605

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 36cf93fb0c45ce62b3cb1e82e1ecae1486017c9b
Component: engine
 2016-08-22 09:14:57 -07: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
lixiaobing10051267 f7b9cff570 Remove option "--manager" description for swarm_join.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 344d7f773d10d429b39c8e4e5c7426d4d1998300
Component: engine
 2016-08-22 15:42:38 +08: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
Justin Cormack 5bd656226f Merge pull request #23235 from runcom/go1.7 
Bump go to 1.7
Upstream-commit: eb4ae8baede682c3ce9985a6a99ede48128b9565
Component: engine
 2016-08-21 19:49:52 +01: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
Sebastiaan van Stijn 3b9e9d8c6a Merge pull request #25902 from MihaiB/docs-link-fragment 
docs: fix typo in url fragment
Upstream-commit: ab533a98dceecec707414006544411cfd18b2d30
Component: engine
 2016-08-21 02:12:02 +02:00
Anusha Ragunathan 83016f7351 Make docker pull detect plugin content and error out. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9b6dcc8b9d1366d3da3c8f60f89de1a36b087b88
Component: engine
 2016-08-20 12:54:35 -07: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
Vincent Demeester 86337f007e Move ListContainersForNode into cluster package 
It makes little sense to have swarm related code into the daemon
package. This refactor the `daemon` and `cluster` package to remove
`ListContainersForNode` from the daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4833b3c961f84555c67418440405e470123919c6
Component: engine
 2016-08-20 14:14:26 +02: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
Oskar Niburski 439c13e4fd Email deprecation for step 6 of tutorial 
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com>
Upstream-commit: aa8eb09d838e06790cc613969a4b7e18b910ce00
Component: engine
 2016-08-19 22:54:12 -04: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
Brian Goff 6a8e5f14f6 Use daemon exec root for swarm control socket 
Right now docker puts swarm's control socket into the docker root dir
(e.g. /var/lib/docker).
This can cause some nasty issues with path length being > 108
characters, especially in our CI environment.

Since we already have some other state going in the daemon's exec root
(libcontainerd and libnetwork), I think it makes sense to move the
control socket to this location, especially since there are other unix
sockets being created here by docker so it must always be at a path that
works.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4d95ea319c4905827fb66fc8da09a6a8ac558004
Component: engine
 2016-08-19 16:43:57 -04: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
Justin Cormack 09421c12c6 Add a Dockerfile for generating manpages on s390x 
Untested.

Hoping CI and @michael-holzheu can test...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 1091dfb60f2326b05f0a3c77ae2b82ee8df370b0
Component: engine
 2016-08-19 17:18:49 +01: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
Justin Cormack 60a509088f Add a Dockerfile for generating manpages on aarch64 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: ecce6f339c7eff048013eadbff1910237446a421
Component: engine
 2016-08-19 15:39:21 +01: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
Justin Cormack cb7a5013da Merge pull request #25858 from cpuguy83/fix_manfile 
Use the correct version of glide
Upstream-commit: 0bf6d4a2dfea1251e6f5102fd9e235b8c77aa9f9
Component: engine
 2016-08-19 12:44:51 +01: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
Lei Jitang 165357a3a8 Persist pause state to disk to support container live restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: f4bbfc34ce1785863dcdea44c981f6532c5e2860
Component: engine
 2016-08-19 05:32:33 -04:00
Liam Macgillavry d3f9e431a9 missed DOCKER->DOCKERD change in 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 for 'status' 
Signed-off-by: Liam Macgillavry <liam@kumina.nl>
Upstream-commit: 11eda60848e476c3a1d84a035642edba74e94c8a
Component: engine
 2016-08-19 11:08:52 +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