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

793 commits

Author SHA1 Message Date
Vincent Demeester
ee08c8542a
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>
 2017-03-27 11:42:15 +02:00
Vincent Demeester
ab08a571d1 Merge pull request #31976 from Microsoft/jjh/csbooboo 
Windows: Remove --credentialspec flag
 2017-03-26 12:44:27 +02:00
Daniel Nephin
b03a185723 Cleanup compose convert error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 10:43:28 -04:00
Vincent Demeester
8d2a82853c Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic 
[compose/interpolation] Make sure we error out instead of panic during interpolation
 2017-03-24 09:00:06 +01:00
John Howard (VM)
53d6aadda5 Windows: Remove --credentialspec flag 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-23 10:01:04 -07:00
Sebastiaan van Stijn
ad530ffee0 Merge pull request #31986 from Microsoft/jjh/fix28267 
Windows: Don't close client stdin handle to avoid hang
 2017-03-23 16:35:54 +01:00
Vincent Demeester
c165a8bfa1
Make sure we error out instead of panic during interpolation 
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-23 16:09:57 +01:00
Vincent Demeester
bb1ae453a6 Merge pull request #32002 from vdemeester/compose-remove-type-dict 
Remove compose types.Dict alias
 2017-03-22 23:08:09 +01:00
Vincent Demeester
d3dc27d145
Remove compose types.Dict alias 
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-22 16:16:20 +01:00
Tonis Tiigi
385f1174ff Return proper exit code on builder panic 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-21 19:09:23 -07:00
John Howard (VM)
91e971c0fe Windows: Don't close client stdin handle to avoid hang 
Signed-off-by: John Howard (VM) <jhoward@microsoft.com>
 2017-03-21 16:00:17 -07:00
Victor Vieux
afe1c5c2eb Merge pull request #31705 from cyli/bump-go-connections 
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
 2017-03-21 10:36:41 -07:00
Vincent Demeester
f965aab5e9 Merge pull request #31621 from dnephin/cleanup-container-run-command 
Some cleanup of container run command
 2017-03-21 16:01:11 +01:00
Sebastiaan van Stijn
1ec77baed9 Merge pull request #31552 from ripcurld0/add_format_secretls 
Add format to secret ls
 2017-03-20 20:20:45 +01:00
Vincent Demeester
550b06ab6a Merge pull request #31948 from vdemeester/compose-typo 
Fixing a small typo in compose loader package
 2017-03-20 17:48:50 +01:00
Vincent Demeester
b8c45c3a57
Fixing a small typo in compose loader package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-20 15:39:57 +01:00
liker12134
2333b39b37 fixed:go vetting warning unkeyed fields 
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
 2017-03-20 16:30:01 +08:00
Boaz Shuster
e281fe9c3a Add format to secret ls 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-19 09:22:30 +02:00
Vincent Demeester
8bc703804d Merge pull request #30781 from AkihiroSuda/fix-stack-env 
compose: fix environment interpolation from the client
 2017-03-17 15:56:50 +01:00
Akihiro Suda
2cdc9c42eb compose: update the comment about MappingWithEquals 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-17 06:21:55 +00:00
Sebastiaan van Stijn
d376b18caf Merge pull request #31896 from aaronlehmann/move-secretrequestoption 
api: Remove SecretRequestOption type
 2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn
f5c57d88a4 Merge pull request #31886 from daniel48/master 
fix a typo
 2017-03-16 21:30:22 +01:00
Sebastiaan van Stijn
3eaeee07c3 Merge pull request #31894 from dnephin/fix-schema-id 
Fix compose schema id for v3.2
 2017-03-16 21:19:59 +01:00
Aaron Lehmann
e7c39f4d5d api: Remove SecretRequestOption type 
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-16 11:20:31 -07:00
Daniel Nephin
576d2181e4 Fix compose schema id for v3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-16 13:53:58 -04:00
Pure White
1d61f11e34 fix a typo 
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
 2017-03-16 23:11:57 +08:00
Sebastiaan van Stijn
e638089622 Add missing API version annotations to commands 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-16 13:40:12 +01:00
Vincent Demeester
52143aee95 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag 
misleading default for --update-monitor duration
 2017-03-16 10:13:26 +01:00
Vincent Demeester
8316753f96 Merge pull request #31866 from gdevillele/pr_service_create 
improve semantics of utility function in cli/command/service
 2017-03-16 10:12:15 +01:00
Akihiro Suda
87c5f67cfa Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain 
fix incorect login client credential save when the registry is the default docker registry
 2017-03-16 13:19:32 +09:00
Gaetan de Villele
1526a99672 improve semantics of utility function in cli/command/service 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-03-15 13:49:52 -07:00
Victor Vieux
4bce232139 Revert "Planned 1.13 deprecation: email from login" 
This reverts commit a66efbddb8.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-15 10:43:18 -07:00
Sebastiaan van Stijn
b0d1936d30 Merge pull request #31302 from dnephin/purge-orphaned-services 
Add --prune to stack deploy
 2017-03-15 12:57:06 +01:00
erxian
3e6ff87f69 misleading default for --update-monitor duration 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2017-03-15 14:20:02 +08: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
Daniel Nephin
644fd804fc Add --prune to stack deploy. 
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:09:28 -04:00
Daniel Nephin
a9c86b63c0 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-14 16:00:43 -04:00
Akihiro Suda
ea43c33330 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-14 15:59:40 -04: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
6a21a127ab Refactor container run cli command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:05:51 -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