beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31386 commits 14 branches 412 tags 338 MiB
Commit graph

31386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Nephin
e7bf5be18b Add compose file version 3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:20:42 -04:00
Vincent Demeester
9dec486cf6
Update docker-credential-helpers to v0.5.0 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-13 21:08:41 +01:00
Sebastiaan van Stijn
75f1bf0e86 Merge pull request #31752 from Microsoft/jjh/stringer 
Fix stringer in Result (pkg\testutil\cmd)
 2017-03-13 20:33:56 +01:00
Daniel Nephin
751552c65f Move endpoint_mode under deploy and add it to the schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 15:00:56 -04:00
allencloud
9679065728 support both endpoint modes in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-13 15:00:49 -04:00
Kenfe-Mickael Laventure
4c95db877c Update containerd to version 949e6facb77383876aeff8a6944dde66b3089574 
This fixes a regression where debug logs where hidden in debug mode.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-13 11:44:40 -07:00
John Howard (VM)
64615c9aa8 Windows: CI Only unpause on Hyper-V containers 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-13 11:24:25 -07:00
Aaron Lehmann
47cd4bf526 Merge pull request #31784 from albers/fix-completion-service-update-constraint 
Fix bash completion for service constraints
 2017-03-13 10:42:22 -07:00
Aaron Lehmann
47615d9871 Merge pull request #31674 from dperny/service-logs-err-on-tty 
Error on attempting services logs on TTY container
 2017-03-13 10:17:33 -07:00
Justin Cormack
2c6a1e1878 Merge pull request #31579 from ijc25/cpuacct 
Correct CPU usage calculation in presence of offline CPUs and newer Linux
 2017-03-13 16:32:18 +00:00
John Howard (VM)
4af3389d43 Windows: Balk on --privileged 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-13 08:56:17 -07:00
Harald Albers
d1340b9440 Fix bash completion for service constraints 
- Remove bash completion for `service update --constraint`
- Add bash completion for `service update --constraint-{add,rm}`

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-13 16:52:38 +01:00
John Howard (VM)
f577131d3b Fix stringer in Result (pkg\testutil\cmd) 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-13 08:40:31 -07:00
Vincent Demeester
4744b01d3b Merge pull request #31712 from rcjsuen/patch-2 
Fix directive example to match description
 2017-03-13 16:34:29 +01:00
Vincent Demeester
9c498eae4d Merge pull request #31682 from albers/completion-service-create--stop-signal 
Add bash completion for `service create|update --stop-signal`
 2017-03-13 16:22:27 +01:00
Vincent Demeester
e311c14019 Merge pull request #31773 from cyphar/apparmor-fix-ensure-exec 
daemon: also ensureDefaultApparmorProfile in exec path
 2017-03-13 16:15:49 +01:00
Vincent Demeester
be453c5a13 Merge pull request #30788 from ripcurld0/hide_win_opts 
Hide command options that are related to Windows
 2017-03-13 16:15:29 +01:00
Sebastiaan van Stijn
562d2dc978 Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect 
do not fail fast when executing inspect command
 2017-03-13 16:04:04 +01:00
Vincent Demeester
2fca6526d6 Merge pull request #31503 from Microsoft/jjh/cleanuphcsonrestore 
Windows: Cleanup HCS on restore
 2017-03-13 13:43:35 +01:00
Sebastiaan van Stijn
7f6e7088b7 Merge pull request #31047 from yallop/cli-v-state 
Flags for specifying bind mount consistency
 2017-03-13 11:36:10 +01:00
Santhosh Manohar
6708676464 Vendor libnetwork for network inspect --verbose changes 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-12 21:23:21 -07:00
Aleksa Sarai
790a81ea9a
daemon: also ensureDefaultApparmorProfile in exec path 
When 567ef8e785 ("daemon: switch to 'ensure' workflow for AppArmor
profiles") was merged, it didn't correctly handle the exec path if
AppArmor profiles were deleted. Fix this by duplicating the
ensureDefaultApparmorProfile code in the exec code.

Fixes: 567ef8e785 ("daemon: switch to 'ensure' workflow for AppArmor profiles")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2017-03-13 15:20:05 +11:00
Misty Stanley-Jones
0ce13eb0d3 Fix markdown in references for Kramdown 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-03-12 12:01:06 -07:00
Vincent Demeester
613334eb50 Merge pull request #31736 from mlaventure/update-runc 
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
 2017-03-12 10:52:32 +01:00
Boaz Shuster
7199522ea2 Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-12 08:47:17 +02:00
Sebastiaan van Stijn
8b02a15d52 Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options 
stack deploy exits with error if both 'external' and other options are specified for a volume
 2017-03-11 01:59:43 +01:00
Tibor Vass
e10f9db26d Merge pull request #30047 from duglin/distError 
Add the mediaType to the error
 2017-03-10 16:44:49 -08:00
Tibor Vass
43f8bce876 Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb 
Vendor swarmkit 0e2d9eb
 2017-03-10 16:33:15 -08:00
Drew Erny
8dc437bd9b Add tail and since to service logs 
This change adds the ability to do --tail and --since on docker service
logs. It wires up the API endpoints to each other and fixes some older
bugs. It adds integration tests for these new features.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-03-10 14:59:00 -08:00
Drew Erny
37ae1ef0ff Error on attempting service logs on TTY container 
Right now getting logs from a service with an attached TTY does not
work. The behavior was undefined and caused the command to hang and
strange messages to occur in the daemon logs.

This returns errors, both deep in the swarmkit adapter (to guard against
undefined behavior, which is Bad) and in the daemon (to tell users that
the thing they're asking for is not possible).

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-03-10 14:48:56 -08:00
Kenfe-Mickael Laventure
6cea6d40fc Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228 
This fix a conflict with systemd daemon-reload (see
https://github.com/opencontainers/runc/pull/1344)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-10 14:07:56 -08:00
Victor Vieux
b6c5b4730b Merge pull request #31739 from mlaventure/update-containerd 
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
 2017-03-10 14:04:53 -08:00
Aaron Lehmann
79bf23845b Vendor swarmkit 0e2d9eb 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-10 11:15:44 -08:00
Brian Goff
c29c2a9a70 Merge pull request #31679 from allencloud/put-secret-in-swarm-thing 
move secret into swarm thing in swagger
 2017-03-10 13:50:25 -05:00
Brian Goff
05e7f956bd Merge pull request #31532 from aboch/vnd 
Vendoring libnetwork @1a01921
 2017-03-10 12:55:19 -05:00
Kenfe-Mickael Laventure
07ad8c6640 Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb 
This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-10 09:16:12 -08:00
Brian Goff
2c2983cd8e Merge pull request #31665 from mlaventure/aufs-lsof-oob 
Remove aufs debugEBusy()
 2017-03-10 11:51:14 -05:00
Justin Cormack
400d154737 Merge pull request #31703 from jen20/solaris-cflags 
pkg/system: Set appropriate CFLAGS on Solaris
 2017-03-10 14:34:53 +00:00
Sebastiaan van Stijn
61f7f0fc9e Merge pull request #31730 from thaJeztah/cherry-autoremove-it 
Add integration tests for client- and daemon-side auto-remove
 2017-03-10 15:00:14 +01:00
Vincent Demeester
83e29a5d87 Merge pull request #31582 from dnephin/misc-flag-cleanup 
Cleanup some memory flags used in the CLI
 2017-03-10 14:16:42 +01:00
Ian Campbell
115f91d757 Correct CPU usage calculation in presence of offline CPUs and newer Linux 
In https://github.com/torvalds/linux/commit/5ca3726 (released in v4.7-rc1) the
content of the `cpuacct.usage_percpu` file in sysfs was changed to include both
online and offline cpus. This broke the arithmetic in the stats helpers used by
`docker stats`, since it was using the length of the PerCPUUsage array as a
proxy for the number of online CPUs.

Add current number of online CPUs to types.StatsJSON and use it in the
calculation.

Keep a fallback to `len(v.CPUStats.CPUUsage.PercpuUsage)` so this code
continues to work when talking to an older daemon. An old client talking to a
new daemon will ignore the new field and behave as before.

Fixes #28941.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-03-10 10:24:33 +00:00
Sebastiaan van Stijn
b3e4412ab4
Add integration tests for client- and daemon-side auto-remove 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 32dbb5c465)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-10 11:04:00 +01:00
Sebastiaan van Stijn
6c31abde20 Merge pull request #30870 from ripcurld0/fix_msg_rm 
Fix the rm error message when a container is restarting/paused
 2017-03-10 10:04:49 +01:00
allencloud
fb1f22b06a do not fail fast when executing inspect command 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-10 16:09:09 +08:00
Sebastiaan van Stijn
18163a42ec Merge pull request #31718 from aaronlehmann/broken-resp 
cluster: Fix shadowed resp variable
 2017-03-10 08:36:12 +01:00
allencloud
6918624985 move secret into swarm thing in swagger 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-10 10:20:55 +08:00
Akihiro Suda
d610d3f61c TestDuplicateMountpointsForVolumesFromAndMounts: remove unintentional dependency for /tmp/data 
/tmp/data needs to be created before running this test (by some other test)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-10 02:04:45 +00:00
Aaron Lehmann
9d127f8de3 cluster: Fix shadowed resp variable 
The response would never reach the client because it was being
redeclared in the current scope.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-09 17:58:12 -08:00
Akihiro Suda
239645c08d Merge pull request #31701 from jlaswell/master 
Fix typo in run.md documentation
 2017-03-10 10:15:49 +09:00
Michael Crosby
abb0fec9d0 Merge pull request #31704 from mlaventure/handle-paused-container-on-non-live-restore 
Handle paused container when restoring without live-restore set
 2017-03-09 15:59:02 -08:00