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

762 commits

Author SHA1 Message Date
Tonis Tiigi
164f1d362e Return proper exit code on builder panic 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 385f1174ff)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-28 17:34:11 -07:00
Victor Vieux
c97450059d Revert "Planned 1.13 deprecation: email from login" 
This reverts commit a66efbddb8.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 4bce232139)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-28 17:26:02 -07:00
Vincent Demeester
b721d55399 Set the alias to the service name instead of the network name 
This makes it work a little closer to compose part and it is more
correct 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit ee08c8542a)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-28 17:24:07 -07:00
Victor Vieux
73b512220d Merge pull request #31977 from cyli/bump-go-connections-17.04 
Bump go connections for 17.04 and use either system pool or custom CA pool when connecting from client->daemon [17.04]
 2017-03-23 17:07:28 -07:00
Akihiro Suda
fac9e24c7c compose: update the comment about MappingWithEquals 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-23 02:09:26 +00:00
Daniel Nephin
7a4482a144 Fix environment resolving. 
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-23 02:09:26 +00:00
Akihiro Suda
88c18fb45c compose: fix environment interpolation from the client 
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-23 02:09:26 +00:00
Ying Li
60d17202f0 Use either the system root pool or an empty cert pool with custom CA roots, 
and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-03-21 10:54:56 -07:00
Sebastiaan van Stijn
581c601408
Merge pull request #31894 from dnephin/fix-schema-id 
Fix compose schema id for v3.2
(cherry picked from commit 3eaeee07c3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-16 21:21:49 +01:00
Anusha Ragunathan
95b46ff68f Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format 
docker stack deploy interpolation format error due to not escaping $ now includes a hint
 2017-03-14 17:14:09 -07:00
Victor Vieux
1a24abe42d Merge pull request #31809 from vieux/bump_api 
bump API to 1.28
 2017-03-14 11:53:52 -07:00
Daniel Nephin
cd56476f18 Merge pull request #31795 from dnephin/compose-file-v3.2 
Compose file v3.2
 2017-03-14 14:10:24 -04:00
Justin Cormack
49376cddab Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy 
Add expanded mount format to stack deploy
 2017-03-14 17:53:28 +00:00
Victor Vieux
cd173a6030 bump API to 1.28 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-14 09:32:50 -07:00
Vincent Demeester
1d4608032d Merge pull request #31500 from dperny/fix-service-logs-cli 
Add tail and since to service logs
 2017-03-14 14:19:29 +01:00
Madhu Venugopal
cdf66ba715 Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Santhosh Manohar
14f76a21db Enhance network inspect to show all tasks, local & non-local, in swarm mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-13 17:52:08 -07:00
Brian Goff
aa733ba8a8 Merge pull request #31672 from dperny/service-logs-formatting 
Service logs formatting
 2017-03-13 19:08:55 -04:00
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
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
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
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
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
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
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
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
Harald Albers
b303e229ca Fix description of docker run|create --stop-signal in help message 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-09 09:32:16 +01:00
Drew Erny
83c34de515 Fixed concerns, updated, and rebased PR. 
Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-03-08 16:35:58 -08:00
Andrea Luzzardi
70a4369f5e service logs: Improve formatting 
- Align output. Previously, output would end up unaligned because of
longer task names (e.g. web.1 vs web.10)
- Truncate task IDs and add a --no-trunc option
- Added a --no-ids option to remove IDs altogether
- Got rid of the generic ID Resolver as we need more customization.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2017-03-08 14:08:04 -08:00
Sebastiaan van Stijn
fb024df8f0 Merge pull request #31443 from james-nesbitt/export-more-compose-methods 
exported add. cli compose loader parsing methods
 2017-03-08 15:12:42 +01:00
Brian Goff
dd221a1e17 Merge pull request #31258 from dnephin/fix-override-default-stack-network 
Support customizing the default network for a stack
 2017-03-07 14:28:16 -05:00
Arash Deshmeh
96039b394a stack deploy exits with error if both 'external' and any other options are specified for volumes 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-03-07 14:21:45 -05:00
James Nesbitt
a1560a0cf2 exported cli compose loader parsing methods 
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
 2017-03-07 17:36:35 +02:00
Daniel Nephin
afcaeedbd4 Use opts.MemBytes for flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-07 10:32:49 -05:00
Daniel Nephin
2e9f9d2c34 Some things just need to be line wrapped. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 16:01:57 -05:00
Daniel Nephin
a1bbb2f7ea Convert new compose volume type to swarm mount type 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
190dc5a40a Support expanded mounts in Compose loader 
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
32c955b8fe Parse a volume spec on the client, with support for windows drives 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Daniel Nephin
65c899bee5 Add expanded mount syntax to Compose schema and types. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-06 11:45:01 -05:00
Sebastiaan van Stijn
3cfc3e30a8 Merge pull request #31543 from chawlanikhil24/master 
Replaced "err" with  "nil" & added a comment
 2017-03-06 15:11:14 +01:00
Nikhil Chawla
73309aa009 Fixed the typo in the code 
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
 2017-03-06 17:31:04 +05:30
Aaron Lehmann
f9bd8ec8b2 Implement server-side rollback, for daemon versions that support this 
Server-side rollback can take advantage of the rollback-specific update
parameters, instead of being treated as a normal update that happens to
go back to a previous version of the spec.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-03 16:33:34 -08:00
Aaron Lehmann
3a88a24d23 Add support for rollback flags 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-03 16:33:34 -08:00
Aaron Lehmann
cc9d04647a Add support for the "rollback" failure action 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-03 16:33:34 -08:00
Yong Tang
f2197b6794 Fix error caused by overlapping merge of 30733 
This fix fixes build error caused by overlapping merge of 30733 and 28213.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-03-03 13:26:00 -08:00