Commit Graph
25895 Commits
Author SHA1 Message Date
Brian Goff 026db8e18b Merge pull request #24307 from cyphar/remove-systemd-rlimits
contrib: systemd: set Limit* to infinity
Upstream-commit: 34a9e9d051824ef9ff2bb6147cec23ef03558b5c
Component: engine
2016-07-05 16:02:47 -04:00
Brian Goff bf5c518081 Merge pull request #24013 from dmcgowan/atomic-libtrust-key-file-write
Atomically save libtrust key file
Upstream-commit: 97aebe9a6c301bd7836042a171bfaae5652979fd
Component: engine
2016-07-05 15:28:41 -04:00
Alexander Morozov f3ff9e9f18 Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name
Allow service and node filter to be name in `tasks` subcommands 
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
2016-07-05 12:16:57 -07:00
Sebastiaan van Stijn add5c424d4 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>
Upstream-commit: 156e77cb0db0c9cb127780fac583b5a38f84493a
Component: engine
2016-07-05 12:00:26 -07:00
Antonio Murdaca 014f1e30a3 Merge pull request #24335 from tophj-ibm/ppc64le-remove-go-sha-check
ppc64le: remove go SHA check
Upstream-commit: fd30292dd81a9543131a9b9099480fe0c5809ac2
Component: engine
2016-07-05 20:51:47 +02:00
Aaron Lehmann 3660e7a630 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>
Upstream-commit: 2f19e910bdeee94a2962ce8457325e92aa21ce0e
Component: engine
2016-07-05 10:02:16 -07:00
Alexander Morozov cfca5f9c64 Merge pull request #24298 from allencloud/fix-stdout-and-stderr-in-api-client
fix stdout and stderr in api client
Upstream-commit: a44e0fedc2b69944f764dc82134e8aa0d12bde5d
Component: engine
2016-07-05 09:58:25 -07:00
Arnaud Porterie eff3f9141a Merge pull request #23996 from dmcgowan/always-store-image-digest-update
[carry 23503]  Always store the image digest when pulling and pushing an image.
Upstream-commit: ee0283c97a44fd8e67f2df81d076eb4b1858b3d2
Component: engine
2016-07-05 16:18:20 +00:00
Alexander Morozov 4306c5def3 Merge pull request #24191 from tonistiigi/mask-secrets
Mask swarm secrets from daemon logs
Upstream-commit: 55b8216279b40f6712ccdd46a6e2ac73c4bdbba0
Component: engine
2016-07-05 08:56:33 -07:00
Christopher Jones b821a0da60 ppc64le: remove go SHA check
Makes it consistent with other Dockerfiles.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d9e12cba5a9a2291f56eb3921b06ac1b5f85dfc7
Component: engine
2016-07-05 11:54:19 -04:00
allencloud 60d7b2e452 fix stdout and stderr in api client
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 533bd82e41fee352962cb5ae0a49b9edbdebc25e
Component: engine
2016-07-05 23:07:40 +08:00
Vincent Demeester f2db9c3fd0 Merge pull request #24332 from allencloud/fix-typos
fix typos
Upstream-commit: dc31f4f6db5edff7c8554ec0725365a344bdec20
Component: engine
2016-07-05 16:29:29 +02:00
allencloud 9921891219 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: edc307cb9213d11d9c5911b08ebd921a097939c0
Component: engine
2016-07-05 20:42:17 +08:00
Vincent Demeester fb5eda0793 Merge pull request #24321 from F21/fix-grammatical-error
Fix a grammatical error in errClusterNetworkOnRun()'s error message.
Upstream-commit: feb7b4d0004f380767cd26ef60032fd839accb5b
Component: engine
2016-07-05 12:17:25 +02:00
Antonio Murdaca 7db75cd617 Merge pull request #24300 from coolljt0725/arm64_test
Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64
Upstream-commit: 98fa9ef7d313d2b3da0d9f7826b5d47e2488973c
Component: engine
2016-07-05 12:13:30 +02:00
Anil Madhavapeddy 21a36cd129 Improve the warning messages when leaving a Swarm cluster
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 22a3d1fa209282e938ca16f31cce0dab4f35bf72
Component: engine
2016-07-05 09:14:23 +01:00
Francis Chuang 78dacb842c Fix a grammatical error in errClusterNetworkOnRun()'s error message.
Signed-off-by: Francis Chuang <francis.chuang@boostport.com>
Upstream-commit: 1205a5584650388f36cda922556a31cbce827915
Component: engine
2016-07-05 16:18:06 +10:00
Vincent Demeester 9ea2cdd8c8 Merge pull request #24312 from skaasten/patch-1
Fix typo - stacks being managed, not tasks?
Upstream-commit: 39536c4866b03c78b281d7ac27392740b2207d36
Component: engine
2016-07-04 18:11:38 +02:00
skaasten 5ea7133a76 Fix typo - stacks being managed, not tasks?
Upstream-commit: 88da491cd9e2c2ea15df15654ac4d98f425d54ed
Component: engine
2016-07-04 11:13:57 -04:00
Antonio Murdaca 73a948ed7f Merge pull request #24274 from sdurrheimer/zsh-completion-service
Add zsh completion for 'docker service' commands
Upstream-commit: c1bbe36ba4696103766d47f1ef245872b5ecbb1a
Component: engine
2016-07-04 15:16:35 +02:00
Steve Durrheimer 1e37a43b53 Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f5d768e2c53f777e1add70f0e367e58db561842e
Component: engine
2016-07-04 15:14:58 +02:00
Aleksa Sarai ec59bad07c 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>
Upstream-commit: 8db61095a3d0bcb0733580734ba5d54bc27a614d
Component: engine
2016-07-04 23:00:28 +10:00
Antonio Murdaca c1be799486 Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
Upstream-commit: d97233ca886d50afd060f3a4fe584ac8e51ea998
Component: engine
2016-07-04 14:40:56 +02:00
Antonio Murdaca d949dcdf67 Merge pull request #24273 from sdurrheimer/zsh-completion-plugin
Add zsh completion for 'docker plugin' commands
Upstream-commit: 687c15f51822a5b059d446a9c090298cd9c2bfaf
Component: engine
2016-07-04 14:40:20 +02:00
Antonio Murdaca 30700c8fb1 Merge pull request #24299 from coolljt0725/chmod_syscall
Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod
Upstream-commit: 8b2597b3fab6efa3a113c29ff98ca70fb1f99730
Component: engine
2016-07-04 14:38:50 +02:00
Lei Jitang ad6ea85075 Add fchmod and fchmodat to TestRunSeccompProfileDenyChmod
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 8c179348c31392559d95481b47625769a7620a21
Component: engine
2016-07-04 11:06:48 +00:00
Lei Jitang 3f6199071c 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>
Upstream-commit: 9c1566a1dfa3eccd12e09a3e2cbda60503600d44
Component: engine
2016-07-04 10:09:46 +00:00
Vincent Demeester 4fd87232eb Merge pull request #24293 from allencloud/add-whitespace-in-log
add a whitespace in plugin's logging
Upstream-commit: c49b0a4b8bce407a25358a7dd40c75b991a0ddcc
Component: engine
2016-07-04 08:53:43 +02:00
allencloud 9c0555f6e0 add a whitespace in plugin's logging
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 97c77b7e0dd2eef23beca1180be93733a3a95e82
Component: engine
2016-07-04 09:38:06 +08:00
Steve Durrheimer 6291373a90 Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7ae3caa4e9762b5b74ed0885a3a2782531256281
Component: engine
2016-07-03 23:45:23 +02:00
Vincent Demeester 2b75e6b1f1 Merge pull request #24275 from sdurrheimer/zsh-completion-swarm
Add zsh completion for 'docker swarm' commands
Upstream-commit: 7b2c4df47231725acfc25f8e2338f1ccab70c481
Component: engine
2016-07-03 23:34:14 +02:00
Steve Durrheimer 99daf837b2 Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2086663abdcfe793aeef3e64655df833c144d024
Component: engine
2016-07-03 23:28:38 +02:00
Sebastiaan van Stijn e1f5f0fa5b Merge pull request #24268 from allencloud/change-ambigious-into-ambiguous
fix typo in err msg from ambigious to ambiguous
Upstream-commit: 6aacb1802484710156676fb44644b2c8de9bb662
Component: engine
2016-07-03 14:01:23 -07:00
Sebastiaan van Stijn 90180f1f3d Merge pull request #24272 from sdurrheimer/zsh-completion-node
Add zsh completion for 'docker node' commands
Upstream-commit: df3e3a227b8b8f93aa72673a09e7a83548b7c1b7
Component: engine
2016-07-03 13:58:14 -07:00
Sebastiaan van Stijn 24daab2fb7 Merge pull request #24288 from thaJeztah/fix-typos
fix some nits and typo
Upstream-commit: d05a5f7319f4d3c2cdaccd31eb1b65c9e5fa6997
Component: engine
2016-07-03 13:47:43 -07:00
Vincent Demeester 730f2d8b64 Merge pull request #24287 from ottok/fix-spelling
Fix spelling in comments, strings and documentation
Upstream-commit: 1763474a84770e8af96a065551bc328124222f13
Component: engine
2016-07-03 22:34:00 +02:00
Sebastiaan van Stijn 79ac64501e fix some nits and typo
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 68bf45084e3af9fa20d096b0d557bc1451aa5443
Component: engine
2016-07-03 12:48:08 -07:00
Sebastiaan van Stijn c1d6bc2a49 Merge pull request #24286 from sdurrheimer/zsh-completion-ps-last
Add zsh completion for 'docker ps --last'
Upstream-commit: 4ebe4e83eed97471f0117462f853ed9c27a8c8ea
Component: engine
2016-07-03 12:13:16 -07:00
Steve Durrheimer 6a2679b647 Add zsh completion for 'docker ps --last'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1dc9cf49019d8efa510e691aba72427b0c32ceec
Component: engine
2016-07-03 20:38:54 +02:00
Sebastiaan van Stijn 3c9650b1dc Merge pull request #24285 from albers/completion-ps--last
Add bash completion for `docker ps --last`
Upstream-commit: 1f66e55a4588d3b514ec34ef75836d72421cd7b0
Component: engine
2016-07-03 11:26:03 -07:00
Sebastiaan van Stijn 4c51c62179 Merge pull request #24257 from thaJeztah/fix-swarm-networking-docs
remove incorrect L3 recommendation
Upstream-commit: 8a1249a726e032083460c9b36d566e96191c062d
Component: engine
2016-07-03 11:18:52 -07:00
Otto Kekäläinen 0bdbf282f3 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
Harald Albers 219d193b75 bash completion for default port on docker swarm {init,join}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 009d50e2d8c4f74f38ebefe89b8dd44b69b46660
Component: engine
2016-07-03 10:48:37 -07:00
Harald Albers 8b06f8a5b3 bash completion can be configured to show node and service IDs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 715754ee61a83a710f5c0c3974cfed6b453d5595
Component: engine
2016-07-03 10:48:37 -07:00
Harald Albers 7b31cc7b25 bash completion for docker {service,node} filters
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2b34fa0511a5193b1cb07493555872cfd6b70442
Component: engine
2016-07-03 10:48:37 -07:00
Harald Albers 03817e7b70 Add bash completion for docker ps --last
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: dd883b0ce249961c5d498ebb03fc0f2911ca2586
Component: engine
2016-07-03 10:36:34 -07:00
Sebastiaan van Stijn cf42140a34 Merge pull request #23871 from sbose78/23837-docker-ps-flag
#23837 Added long flag to docker ps for checking latest n containers
Upstream-commit: 1e9c5a856a261b9f65c858cfcd0a507fe88efe26
Component: engine
2016-07-03 10:15:14 -07:00
Sebastiaan van Stijn aa1ae84c39 Merge pull request #24264 from runcom/mandokerd8
man: add missing --add-runtime
Upstream-commit: afce0f594688b51038bff8d697e3c3eeca323e12
Component: engine
2016-07-03 10:13:28 -07:00
Doug Davis dc89b20789 Merge pull request #24281 from aochagavia/patch-1
Fix typo
Upstream-commit: e64a6912532b13beda6f172020438869ebe93d32
Component: engine
2016-07-03 09:22:20 -04:00
Adolfo Ochagavía be820b6010 Fix typo
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
Upstream-commit: 76b09be69683d19c8a9c8cb6c8b693941f62b2ec
Component: engine
2016-07-03 15:20:27 +02:00