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
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
yuexiao-wang
46c68f2339
keep the same between rules and PHONY
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf3d1d1e5a39cb66ff58cedbcc9d6e84163a35f8
Component: engine
2016-08-19 09:08:39 +08: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
Sebastiaan van Stijn
ab2c762e05
Merge pull request #25844 from tiborvass/1.12.1-changelog-to-master
...
Merge 1.12.1 CHANGELOG to master
Upstream-commit: 139bf2c98e13db23d9939b4af4dc739c2fa40008
Component: engine
2016-08-18 21:14:07 +02: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
Brian Goff
Anusha Ragunathan
lixiaobing10051267
Vincent Demeester
Sven Dowideit
Justin Cormack
Antonio Murdaca
Sebastiaan van Stijn
Mihai Borobocea
yuexiao-wang
Oskar Niburski
Aaron Lehmann
Alexander Morozov
Nick DeCoursin
Lei Jitang
Liam Macgillavry
Christopher Jones
Yong Tang
Doug Davis
Darren Stahl
Tibor Vass