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

576 commits

Author SHA1 Message Date
Victor Vieux
6e4a3c4546 Merge pull request #28649 from allencloud/judge-locked-before-parsing-key 
judge manager if locked before parsing key
 2016-11-21 13:33:38 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
allencloud
89100c162b judge manager if locked before parsing key 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-21 16:39:09 +08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Aaron Lehmann
30d0c3899e Merge pull request #28421 from aaronlehmann/digest-pinning-warnings 
Return warnings from service create/update when digest pinning fails
 2016-11-18 11:33:17 -08:00
Evan Hazlett
eb036ea4db
lint fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-18 13:04:08 -05:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-18 09:31:31 -08:00
allencloud
972a246c67 judge manager before unlocking 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 23:49:40 +08:00
Evan Hazlett
bebd472e40 do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-17 15:49:02 -05:00
Alexander Morozov
8a6c5358af Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists 
remove unused error ErrPendingSwarmExists
 2016-11-17 10:17:47 -08:00
yupeng
9551dd03cf Fix the typo 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-17 14:13:38 +08:00
allencloud
7777557a3a remove unused error ErrPendingSwarmExists 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-17 14:06:08 +08:00
Vincent Demeester
673c5ee559 Merge pull request #27631 from allencloud/get-node-brefore-update 
allow node update API to receive node name and id prefix
 2016-11-16 17:47:31 +01:00
Tõnis Tiigi
6697fa8a68 Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg 
Using distribution reference pkg (pin image by digest)
 2016-11-15 20:05:26 -08:00
allencloud
d075b83dd6 allow node update api receive node name and id prefix 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-16 10:18:19 +08:00
Nishant Totla
dc1b6341b9
Refactoring code for pinning image by digest 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-11-15 13:54:47 -08:00
allencloud
729b49e9c5 move func getNetwork into helper.go to keep consistent 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-16 00:28:56 +08:00
allencloud
1addb4817b judge manager before getting secret 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-13 12:52:09 +08:00
Vincent Demeester
84450b72cd Add support for stdin_open in composefile v3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-11 15:19:00 +01:00
Tõnis Tiigi
a5da9f5cc9 Merge pull request #27917 from mrjana/ports 
Add support for host port PublishMode in services
 2016-11-10 19:38:54 -08:00
Tõnis Tiigi
1229105582 Merge pull request #28265 from aaronlehmann/dont-repull-digest 
executor: Don't repull image if pinned by digest
 2016-11-10 19:19:31 -08:00
Jana Radhakrishnan
14ac9f60d0 Add support for host port PublishMode in services 
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-11-10 18:07:55 -08:00
Victor Vieux
750d634d62 Merge pull request #27998 from dnephin/compose-on-swarm 
Support `docker stack deploy` from a Compose file
 2016-11-10 17:59:57 -08:00
Victor Vieux
bed96ce922 Merge pull request #28031 from yongtang/27902-extra-hosts 
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
 2016-11-10 16:55:29 -08:00
John Howard
1e592349f1 Merge pull request #28228 from tonistiigi/swarm-cert-expired 
Start daemon if certificates have been expired
 2016-11-10 15:50:36 -08:00
Aaron Lehmann
5d1feb561f Merge pull request #28221 from aboch/ala 
Add local address autodetection on swarm init
 2016-11-10 15:45:59 -08:00
Aaron Lehmann
f69e5c18ac executor: Don't repull image if pinned by digest 
If the image reference in the spec uses a digest, and an image with that
digest already exists locally, avoid an unnecessary repull.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-10 14:45:54 -08:00
Tonis Tiigi
439de7694d Start daemon if certificates have been expired 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-10 14:11:53 -08:00
Andrea Luzzardi
819d0159bb api: Service Logs support 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-10 13:46:02 -08:00
Alessandro Boch
c8d0cb9e71 Add local address autodetection on swarm init 
- when advertise-addr is not local and listen-addr is
  not specified

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-10 13:45:32 -08:00
Andrea Luzzardi
0ec6865713 cluster executor: Logs retrieving support. 
Plumbed the executor to the container logs backend.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-10 12:02:47 -08:00
Andrea Luzzardi
c13bf5ba51 Merge pull request #28173 from nishanttotla/pin-images-by-digest 
Pin images by digest
 2016-11-10 10:59:28 -08:00
Yong Tang
ea9a23ccdb Add flag --host to service create and --host-add/--host-rm to service update 
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.

This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.

Related docs has been updated.

An integration test has been added.

This fix fixes 27902.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-10 10:20:24 -08:00
Daniel Nephin
eefccc25c5 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Vincent Demeester
d0117238fa Fix hostname support for compose file 
Pass the hostname from ContainerSpec to the actual container.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-10 11:28:18 -05:00
Nishant Totla
764a9ed357
Pin image by digest on service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-11-09 23:31:26 -08:00
Aaron Lehmann
c3c70c4bcd Lock/unlock integration tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
a6030a50c9 Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
0f9fc54df9 Revise swarm init/update flags, add unlocking capability 
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
b4a667c8c4 Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-09 16:09:00 -08:00
Victor Vieux
8ffd1a370c Merge pull request #28025 from vdemeester/swarm-mode-templating 
Add support for swarm mode templating
 2016-11-09 15:57:52 -08:00
Vincent Demeester
6212ea669b
Add support for swarm mode templating 
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-09 23:28:06 +01:00
Evan Hazlett
a9d4118429 embed spec when converting from grpc 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
eff36b7d66 more review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
583c013a87 support labels for secrets upon creation; review updates 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
b2e4c7f3b5 review updates 
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:45 -05:00
Evan Hazlett
88dea0e06e update to support new target in swarmkit 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:44 -05:00
Evan Hazlett
f50a65ff0c update to support latest swarm changes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
189f89301e more review updates 
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00
Evan Hazlett
857e60c2f9 review changes 
- fix lint issues
- use errors pkg for wrapping errors
- cleanup on error when setting up secrets mount
- fix erroneous import
- remove unneeded switch for secret reference mode
- return single mount for secrets instead of slice

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:43 -05:00