Commit graph

25555 commits

Author SHA1 Message Date
Yanqiang Miao
bbfda85261 Fix 'make docker-py' error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-07 10:00:22 +08:00
Brian Goff
a04a11f3e5 Merge pull request from floatingLomas/zsh-completion-fix
Remove unmatched bracket from _docker for zsh
2016-07-06 16:54:16 -04:00
Alexander Morozov
6f052edcc0 Merge pull request from cpuguy83/hacky_swarm_integration_tests
Implement service integration tests
2016-07-06 11:49:27 -07:00
Vincent Demeester
6bf357561f Merge pull request from runcom/fix-cross-push-digests
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
2016-07-06 18:17:51 +02:00
Jonathan Lomas
7631dc80a6
Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
2016-07-06 08:57:28 -07:00
Antonio Murdaca
a0c8970df1 integration-cli: ensure digest is the same after cross-repo push
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:42 +02:00
Antonio Murdaca
8aa37bdbb7 vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:37 +02:00
Vincent Demeester
c70e432cee Merge pull request from avsm/better-leave-grammar
Improve the warning messages when leaving a Swarm cluster
2016-07-06 12:00:20 +02:00
Vincent Demeester
2cc5383f2f Merge pull request from vdemeester/23729-validate-hostname-conditionnaly
Validate hostname starting from 1.24 API.
2016-07-06 11:36:50 +02:00
Vincent Demeester
6daf3d2a78
Validate hostname starting from 1.24 API.
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-06 09:13:59 +02:00
Brian Goff
e5ec575b32 Implement service integration tests
This is done in a hacky way as currently there is no better way.
Uses known implementation details about how tasks are scheduled to be
able to operate on the underlying container.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-05 21:39:42 -04:00
Alexander Morozov
ad44f49470 Merge pull request from allencloud/add-file-close-in-loadBundlefile
fix severe fd leak in stack
2016-07-05 17:45:34 -07:00
allencloud
0af04b6132 fix severe fd leak in stack
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-06 07:00:39 +08:00
Sebastiaan van Stijn
4f44ea3154 Merge pull request from thaJeztah/cherry-pick-24325-to-master
Cherry-pick  to master
2016-07-05 15:27:32 -07:00
Vincent Demeester
c014c9df88 Merge pull request from aaronlehmann/image-spec-fix
image spec: Correct set of acceptable characters in tags
2016-07-06 00:14:03 +02:00
Vincent Demeester
f7d5c4367b
Merge pull request from Anvil/plugins_volume.md-unqiue
Fixed typo: s/unqiue/unique/g
(cherry picked from commit 84aa074d18)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-05 15:11:04 -07:00
Sebastiaan van Stijn
ecc3cfe41b Merge pull request from thaJeztah/add-mike-as-curator
Add Mike as a curator
2016-07-05 13:35:05 -07:00
Arnaud Porterie
5b41316815 Merge pull request from mavenugo/smissues
Fixed a few network UI issues in swarm-mode
2016-07-05 20:28:20 +00:00
Brian Goff
34a9e9d051 Merge pull request from cyphar/remove-systemd-rlimits
contrib: systemd: set Limit* to infinity
2016-07-05 16:02:47 -04:00
Brian Goff
97aebe9a6c Merge pull request from dmcgowan/atomic-libtrust-key-file-write
Atomically save libtrust key file
2016-07-05 15:28:41 -04:00
Alexander Morozov
db75aa029d Merge pull request from vdemeester/tasks-filter-service-node-by-name
Allow service and node filter to be name in `tasks` subcommands
2016-07-05 12:16:57 -07:00
Sebastiaan van Stijn
156e77cb0d
Add Mike as a curator
Mike is going to help us with triaging issues,
so adding him to the curators list to make it
official.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-05 12:00:26 -07:00
Antonio Murdaca
fd30292dd8 Merge pull request from tophj-ibm/ppc64le-remove-go-sha-check
ppc64le: remove go SHA check
2016-07-05 20:51:47 +02:00
Aaron Lehmann
2f19e910bd image spec: Correct set of acceptable characters in tags
The image spec did not match the regexp that validates tags. It
neglected to mention that period and dash characters are allowed in
tags, as long as they are not the first character. It also did not
mention the length limit for tags.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-05 10:02:16 -07:00
Alexander Morozov
a44e0fedc2 Merge pull request from allencloud/fix-stdout-and-stderr-in-api-client
fix stdout and stderr in api client
2016-07-05 09:58:25 -07:00
Arnaud Porterie
ee0283c97a Merge pull request from dmcgowan/always-store-image-digest-update
[carry 23503]  Always store the image digest when pulling and pushing an image.
2016-07-05 16:18:20 +00:00
Alexander Morozov
55b8216279 Merge pull request from tonistiigi/mask-secrets
Mask swarm secrets from daemon logs
2016-07-05 08:56:33 -07:00
Christopher Jones
d9e12cba5a
ppc64le: remove go SHA check
Makes it consistent with other Dockerfiles.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-07-05 11:54:19 -04:00
allencloud
533bd82e41 fix stdout and stderr in api client
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-05 23:07:40 +08:00
Vincent Demeester
dc31f4f6db Merge pull request from allencloud/fix-typos
fix typos
2016-07-05 16:29:29 +02:00
allencloud
edc307cb92 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-05 20:42:17 +08:00
Vincent Demeester
feb7b4d000 Merge pull request from F21/fix-grammatical-error
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
2016-07-05 12:17:25 +02:00
Antonio Murdaca
98fa9ef7d3 Merge pull request from coolljt0725/arm64_test
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
2016-07-05 12:13:30 +02:00
Anil Madhavapeddy
22a3d1fa20 Improve the warning messages when leaving a Swarm cluster
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2016-07-05 09:14:23 +01:00
Francis Chuang
1205a55846
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
Signed-off-by: Francis Chuang <francis.chuang@boostport.com>
2016-07-05 16:18:06 +10:00
Vincent Demeester
39536c4866 Merge pull request from skaasten/patch-1
Fix typo - stacks being managed, not tasks?
2016-07-04 18:11:38 +02:00
skaasten
88da491cd9 Fix typo - stacks being managed, not tasks? 2016-07-04 11:13:57 -04:00
Antonio Murdaca
c1bbe36ba4 Merge pull request from sdurrheimer/zsh-completion-service
Add zsh completion for 'docker service' commands
2016-07-04 15:16:35 +02:00
Steve Durrheimer
f5d768e2c5
Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-04 15:14:58 +02:00
Aleksa Sarai
8db61095a3
contrib: systemd: set Limit* to infinity
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if systemd
sets rlimits on the main Docker daemon process (because the limits
propogate to all children).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-07-04 23:00:28 +10:00
Antonio Murdaca
d97233ca88 Merge pull request from sdurrheimer/zsh-completion-daemon-add-runtime
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
2016-07-04 14:40:56 +02:00
Antonio Murdaca
687c15f518 Merge pull request from sdurrheimer/zsh-completion-plugin
Add zsh completion for 'docker plugin' commands
2016-07-04 14:40:20 +02:00
Antonio Murdaca
8b2597b3fa Merge pull request from coolljt0725/chmod_syscall
Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod
2016-07-04 14:38:50 +02:00
Lei Jitang
8c179348c3 Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-04 11:06:48 +00:00
Lei Jitang
9c1566a1df Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
schema1 manifests is not working on ARM64, we should skip integration-cli
tests for schema1 manifests on ARM64.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-04 10:09:46 +00:00
Vincent Demeester
c49b0a4b8b Merge pull request from allencloud/add-whitespace-in-log
add a whitespace in plugin's logging
2016-07-04 08:53:43 +02:00
allencloud
97c77b7e0d add a whitespace in plugin's logging
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-04 09:38:06 +08:00
Steve Durrheimer
7ae3caa4e9
Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:45:23 +02:00
Vincent Demeester
7b2c4df472 Merge pull request from sdurrheimer/zsh-completion-swarm
Add zsh completion for 'docker swarm' commands
2016-07-03 23:34:14 +02:00
Steve Durrheimer
2086663abd
Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:28:38 +02:00