Commit graph

26736 commits

Author SHA1 Message Date
Justin Cormack
a110512e38 Merge pull request #25963 from yuexiao-wang/fix-repo
Modify incorrect repository URL
2016-08-24 10:57:10 +01:00
Justin Cormack
fe125adb0f Merge pull request #25905 from yongtang/25000-docker-stats-NetworkDisabled
Fix issue in `docker stats` with `NetworkDisabled=true`
2016-08-24 10:53:56 +01:00
Justin Cormack
f77dfd591b Merge pull request #25965 from yongtang/25927-authz-plugin-headers
Fix AuthZ plugins headers change issue
2016-08-24 10:52:27 +01:00
Yong Tang
9cb8fb6ea0 Fix AuthZ plugins headers change issue
This fix tries to address the issue raised in 25927 where
the HTTP headers have been chaged when AUthZ plugin is in
place.

This issue is that in `FlushAll` (`pkg/authorization/response.go`),
the headers have been written (with `WriteHeader`) before all the
headers have bee copied.

This fix fixes the issue by placing `WriteHeader` after.

A test has been added to cover the changes.`

This fix fixes 25927

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-23 21:08:23 -07:00
yuexiao-wang
ad4efd3349 Modify incorrect repository URL
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-24 10:09:33 +08:00
Brian Goff
8c5c2842ba Merge pull request #25903 from anusha-ragunathan/windows_plugin_spec
Add spec file support for Windows plugin discovery.
2016-08-23 19:45:54 -04:00
Yong Tang
7bb9c5397e Fix issue in docker stats with NetworkDisabled=true
This fix tries to address the issue in 25000 where `docker stats`
will not show network stats with `NetworkDisabled=true`.

The `NetworkDisabled=true` could be either invoked through
remote API, or through `docker daemon -b none`.

The issue was that when `NetworkDisabled=true` either by API or
by daemon config, there is no SandboxKey for container so an error
will be returned.

This fix fixes this issue by skipping obtaining SandboxKey if
`NetworkDisabled=true`.

Additional test has bee added to cover the changes.

This fix fixes 25000.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-23 16:04:06 -07:00
Justin Cormack
b5b8ec9aeb Merge pull request #25956 from LK4D4/vet_embedded
Dockerfile: do not install vet and cover
2016-08-24 00:01:29 +01:00
Vincent Demeester
602b238136 Merge pull request #25948 from lixiaobing10051267/masterImages
get a redis-cli image while using docker pull
2016-08-23 21:44:26 +02:00
Vincent Demeester
c009e1b6ce Merge pull request #25941 from imnuh/patch-1
Change TMPDIR to DOCKER_TMPDIR
2016-08-23 21:44:03 +02:00
Tõnis Tiigi
0b2ff0ccde Merge pull request #25946 from lixiaobing10051267/masterDockerImages
Incorrect response field name for command "docker images"
2016-08-23 11:19:52 -07:00
Alexander Morozov
08c16f8abf Dockerfile: do not install vet and cover
They're included in go since 1.5.
Also I've removed comment about ancient gofmt version.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-23 11:08:31 -07:00
Alexander Morozov
20213c6588 Merge pull request #25954 from michael-holzheu/PR-s390x-gccgo61-to-golang17
Dockerfile.s390x: Switch to golang 1.7
2016-08-23 11:00:50 -07:00
Michael Crosby
684d3f0c9c Merge pull request #24740 from jizhilong/devmapper-deferred-remove
devmapper: prevent libdevmapper from deleting /dev/mapper/docker-xxx symbolic links in RemoveDeviceDeferred
2016-08-23 10:23:37 -07:00
Ji.Zhilong
5e505d101f devmapper: prevent libdevmapper from deleting device symlinks in RemoveDeviceDeferred
if there is no cookie set in dm task, or flag DM_UDEV_DISABLE_LIBRARY_FALLBACK
is cleared for a DM_DEV_REMOVE task, libdevmapper will fallback to clean up the
symlink under /dev/mapper by itself, no matter the device removal is executed
immediately or deferred by the kernel.In some cases, the removal is deferred by the
kernel, while the symlink is deleted directly by libdevmapper, when docker tries to
activate the device again, the deferred removal will be canceld, but the symlink will
not show up again, so docker's attempt to mount the device by the symlink will fail,
and it will eventually leads to a `docker start/diff` error.

Fixes #24671

Signed-off-by: Ji.Zhilong <zhilongji@gmail.com>
2016-08-23 23:58:53 +08:00
Michael Holzheu
ee59f25c2d Dockerfile.s390x: Switch to golang 1.7
With golang version 1.7 the s390x architecture is officially supported.
To be in sync with the other architectures now switch also for s390x
from gccgo 6.1 to golang:

 - golang: build and install to /usr/src/go
   * Download golang-1.7 sources
   * Bootstrap with gccgo 6.1
 - go lint: Sync GO_LINT_COMMIT with other Dockerfiles
 - notary: Remove GO15VENDOREXPERIMENT and softlink hack

With this patch the current CI on s390x completes with:

 - OK: 1375 passed, 43 skipped

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-08-23 08:20:20 -04:00
Vincent Demeester
b97f985054 Merge pull request #25939 from YuPengZTE/printf
It is better to add "\n" in printf
2016-08-23 10:26:54 +02:00
Vincent Demeester
442da0d8aa Merge pull request #25793 from yuexiao-wang/clean-makefile
Clean up the Makefile
2016-08-23 09:43:25 +02:00
lixiaobing10051267
4f7195e3c9 get a redis-cli image using docker pull
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-23 14:44:37 +08:00
lixiaobing10051267
8eae3ceab8 Incorrect response field name for command "docker images"
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-23 14:24:31 +08:00
Neyazul Haque
10cebd4c74 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>
2016-08-23 08:45:46 +05:30
Doug Davis
a949a79a58 Merge pull request #25931 from fj/patch-1
Fix minor typo in "Getting Started" documentation
2016-08-22 21:53:47 -05:00
Alexander Morozov
251bc2bcd7 Merge pull request #25833 from tonistiigi/update-swarmkit
vendor: update swarmkit to 8a761950f
2016-08-22 19:36:44 -07:00
YuPengZTE
9b015bd4fd It is better to add "\n" in printf
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-08-23 09:01:25 +08:00
Aaron Lehmann
7cd88e5ec4 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
Remove option "--manager" description for swarm_join.md
2016-08-22 13:13:21 -07:00
Alexander Morozov
2e1a594237 Merge pull request #25824 from dmcgowan/overlay2-make-faster
Avoid fork on mount for overlay2 in common case
2016-08-22 13:02:22 -07:00
John Feminella
435bc9d989 Fix minor typo in "Docker Engine runs navitvely"
Signed-off-by: John Feminella <jxf@jxf.me>
2016-08-22 15:43:26 -04:00
Derek McGowan
c13a985fa1 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)
2016-08-22 11:43:10 -07:00
Tonis Tiigi
96a27cf093 Update executor changes from swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-22 11:36:20 -07:00
Tonis Tiigi
ee030251f2 vendor: update swarmkit in 8a761950f
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-08-22 11:36:06 -07:00
Aaron Lehmann
3b374a25f2 Merge pull request #25582 from anusha-ragunathan/detect-plugin-mediatype
Make `docker pull` detect plugin content and error out.
2016-08-22 09:29:51 -07:00
Brian Goff
2fb2bbe407 Merge pull request #25869 from cjdmax/master
debian sysvinitscript one missed DOCKER->DOCKERD change
2016-08-22 12:24:31 -04:00
Brian Goff
374caa98d8 Merge pull request #25872 from coolljt0725/fix_25870
Persist pause state to disk to support container live restore
2016-08-22 12:18:01 -04:00
Brian Goff
d3b0064d4a Merge pull request #25881 from justincormack/aarch64-manpages
Add a Dockerfile for generating manpages on aarch64
2016-08-22 12:16:09 -04:00
Anusha Ragunathan
36cf93fb0c 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>
2016-08-22 09:14:57 -07:00
Brian Goff
43640a890f Merge pull request #25889 from vdemeester/refactoring-reachable-lisibility
Make reachable/unreachable condition more readable
2016-08-22 11:10:03 -04:00
lixiaobing10051267
344d7f773d Remove option "--manager" description for swarm_join.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-22 15:42:38 +08:00
Vincent Demeester
d2fa978d4d Merge pull request #25899 from yuexiao-wang/fix-overview
Optimize description for Feature highlights
2016-08-22 09:17:32 +02:00
Vincent Demeester
daf454d8cd Merge pull request #25719 from eskaaren/master
You can force leave swarm
2016-08-22 09:15:37 +02:00
Vincent Demeester
c1bdda0be8 Merge pull request #25775 from ddgenome/entrypoint-env
Remove erroneous ENTRYPOINT note
2016-08-22 09:13:54 +02:00
Sven Dowideit
e168f0b4ad Merge pull request #25835 from decoursin/patch-1
Update apparmor error message
2016-08-22 15:47:23 +10:00
Sven Dowideit
abd08f4784 Merge pull request #25901 from yuexiao-wang/add-content
Add the content for how services work
2016-08-22 11:58:30 +10:00
Justin Cormack
eb4ae8baed Merge pull request #23235 from runcom/go1.7
Bump go to 1.7
2016-08-21 19:49:52 +01:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-21 19:04:15 +02:00
Sebastiaan van Stijn
ab533a98dc Merge pull request #25902 from MihaiB/docs-link-fragment
docs: fix typo in url fragment
2016-08-21 02:12:02 +02:00
Anusha Ragunathan
9b6dcc8b9d Make docker pull detect plugin content and error out.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-20 12:54:35 -07:00
Mihai Borobocea
441ecc459f 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>
2016-08-20 16:19:05 +03:00
yuexiao-wang
2b0892c02e Add the content for how services work
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-20 17:32:29 +08:00
yuexiao-wang
dde0f86a88 Optimize description for Feature highlights
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-20 16:24:18 +08:00
Vincent Demeester
82a451bc94
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>
2016-08-19 22:49:58 +02:00