Commit Graph
100 Commits
Author SHA1 Message Date
allencloud ed60722124 not export errors and forbid leave when unlocked
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7bdd1a4f9c06ab4af8e652b7483104456e72c442
Component: engine
2016-12-07 13:25:34 +08:00
Tõnis Tiigi d262373ee7 Merge pull request #28907 from tonistiigi/cluster-refactor
Switch cluster locking strategy
Upstream-commit: eefbf1ddd3ee4e6b6e6dc7e938e77a96ceb40163
Component: engine
2016-12-06 10:02:23 -08:00
Tonis Tiigi bcb5d5d669 Switch cluster locking strategy
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b7ea1bdb0227a789a15e23821b8db4d5ddceb26e
Component: engine
2016-11-30 14:59:12 -08:00
Vincent Demeester d598152124 Merge pull request #28899 from aaronlehmann/dont-pull-image-id
Don't resolve or pull images referenced by ID
Upstream-commit: 768f4ce02b5a2a86ea100d0b875c5949ea652c7d
Component: engine
2016-11-30 10:08:43 +01:00
Aaron Lehmann 6eff6aab71 cluster: Refuse swarm spec not named "default"
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9dba9e3248f8476d15242ce3ec0bf6d6d50c1a76
Component: engine
2016-11-28 17:19:29 -08:00
Aaron Lehmann 4d8affc167 Don't resolve or pull images referenced by ID
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 089842c4b47c262187b0b1a8d6d124f3faa03752
Component: engine
2016-11-28 13:53:52 -08:00
Ben Firshman 64b693348d Improve error when connecting service to network
The error didn't hint at how to resolve it. Google auto-suggest
also implies that people have been Googling this error.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 70acb89fa2e889393d33664bc780cf116795f3e4
Component: engine
2016-11-24 14:43:24 +00:00
Andrea Luzzardi abd795e582 service logs: Support no-follow mode
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
2016-11-21 18:02:13 -08:00
allencloud 9fec0659ba judge manager if locked before parsing key
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 89100c162b23791b4a64d142a11014257bf61fd0
Component: engine
2016-11-21 16:39:09 +08:00
Victor Vieux c148947fe6 fix a few golint errors
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
2016-11-18 18:32:02 -08:00
Aaron Lehmann 71cdb489af Merge pull request #28421 from aaronlehmann/digest-pinning-warnings
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
2016-11-18 11:33:17 -08:00
Aaron Lehmann 2efd6e2078 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>
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
allencloud 7534114314 judge manager before unlocking
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 972a246c671b52786a5e57743babfcf7b5b5ae99
Component: engine
2016-11-18 23:49:40 +08:00
Alexander Morozov 1f1e59bbc9 Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists
remove unused error ErrPendingSwarmExists
Upstream-commit: 8a6c5358af9cf4485cd2c993a9d4111deb10c81c
Component: engine
2016-11-17 10:17:47 -08:00
yupeng 700764fb6d Fix the typo
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 9551dd03cfad2ec0a00d89c2177fb7b45b6ad885
Component: engine
2016-11-17 14:13:38 +08:00
allencloud 061156aacb remove unused error ErrPendingSwarmExists
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7777557a3a8599fbbd8e9a04d7328898c663ded1
Component: engine
2016-11-17 14:06:08 +08:00
Vincent Demeester 7acf8456de Merge pull request #27631 from allencloud/get-node-brefore-update
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
2016-11-16 17:47:31 +01:00
Tõnis Tiigi d6be8a084e Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
Using distribution reference pkg (pin image by digest)
Upstream-commit: 6697fa8a68db41162063df90f54f8b039d4ca4a1
Component: engine
2016-11-15 20:05:26 -08:00
allencloud 0d115ba911 allow node update api receive node name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
2016-11-16 10:18:19 +08:00
Nishant Totla f5355b9dd8 Refactoring code for pinning image by digest
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: dc1b6341b98c3d009342a878119f683bfe14b471
Component: engine
2016-11-15 13:54:47 -08:00
allencloud 68648e07db move func getNetwork into helper.go to keep consistent
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 729b49e9c546c035788e60ea137b0958d10aadde
Component: engine
2016-11-16 00:28:56 +08:00
John Howard 87b507f694 Merge pull request #28228 from tonistiigi/swarm-cert-expired
Start daemon if certificates have been expired
Upstream-commit: 1e592349f192d020b14372f4d3c21cd3a7c8bd9a
Component: engine
2016-11-10 15:50:36 -08:00
Aaron Lehmann 4cf2d87976 Merge pull request #28221 from aboch/ala
Add local address autodetection on swarm init
Upstream-commit: 5d1feb561f1f8b402b5c77b2f27f3d571bd2b226
Component: engine
2016-11-10 15:45:59 -08:00
Tonis Tiigi b55a4aaec7 Start daemon if certificates have been expired
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 439de7694d67eede9867aae12f304772962bffcd
Component: engine
2016-11-10 14:11:53 -08:00
Andrea Luzzardi 4d22d82151 api: Service Logs support
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 819d0159bbda1b3ae53bdaa9a3e62ac98497e24c
Component: engine
2016-11-10 13:46:02 -08:00
Alessandro Boch 2e628cd947 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>
Upstream-commit: c8d0cb9e716585f33dc730911332adbbc458513a
Component: engine
2016-11-10 13:45:32 -08:00
Andrea Luzzardi a2106ea21e Merge pull request #28173 from nishanttotla/pin-images-by-digest
Pin images by digest
Upstream-commit: c13bf5ba51c4f6a1ba5e5c0da0d4f85d2d5b9116
Component: engine
2016-11-10 10:59:28 -08:00
Nishant Totla 58e0e2f371 Pin image by digest on service create and update
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 764a9ed357bca8fdccf1a794278463453f83f6ff
Component: engine
2016-11-09 23:31:26 -08:00
Aaron Lehmann f3d621f988 Lock/unlock integration tests
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c3c70c4bcd775d20e2d4a4989733f7ad6b2b90b2
Component: engine
2016-11-09 16:09:01 -08:00
Aaron Lehmann 2394a196a1 Add unlock key rotation
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
2016-11-09 16:09:01 -08:00
Aaron Lehmann 0827ead1b6 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>
Upstream-commit: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
2016-11-09 16:09:00 -08:00
Tonis Tiigi 2874df7efa Add support for swarm init lock and swarm unlock
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
2016-11-09 16:09:00 -08:00
Aaron Lehmann db11fea742 Merge pull request #27123 from tonistiigi/fix-join-reconnect
Don’t attempt to reconnect swarm on failed join after timeout
Upstream-commit: 0ccbae04370f8c48a6ae0ff2fc4181347f89e11d
Component: engine
2016-11-08 14:53:44 -08:00
Drew Erny 4399a05e84 use named pipe on windows
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 5b6c565f74731201f7a03163516048f454e9e9d5
Component: engine
2016-11-02 13:47:35 -07:00
Sebastiaan van Stijn 50046511ff Merge pull request #27948 from WeiZhang555/consistent-filters
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: f96d45dc8ac21db1f082230e2f828a86e15cad46
Component: engine
2016-11-02 00:53:15 -07:00
Zhang Wei 9cb45952e0 Replace all "Filter" field with "Filters" for consistency
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 89a6966726941b4b7f0431ab214013cf9c655c25
Component: engine
2016-11-01 23:09:30 +08:00
Daehyeok Mun 07a831dfc2 Fix logrus formatting
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.

Fixed issue #23459

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: fa710e504b0e3e51d4031790c18621b02dcd2600
Component: engine
2016-10-31 22:05:01 -06:00
Alexander Morozov 5572f883e7 Merge pull request #27698 from tonistiigi/cluster-config-refactor
Refactor swarm node config to struct
Upstream-commit: 844a3166e5c8ea5037a658f1e8f0628f5abc8dce
Component: engine
2016-10-25 13:29:55 -07:00
Tonis Tiigi 179ef095e3 Refactor swarm node config to struct
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b1014428c11a5495e713f2ab6df5aae45e8a46a6
Component: engine
2016-10-24 16:36:50 -07:00
Evelynhsu a9bf94a379 remove duplicated error judgement in cluster.go
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 75c51ad76b0b5995e9349cb369c9e8664f40855c
Component: engine
2016-10-21 14:28:10 +08:00
Aaron Lehmann 0ce7aa426e Vendor swarmkit in master
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 12a4ed03178982fec44b75479c3e63a316503d90
Component: engine
2016-10-20 13:49:22 -07:00
Aaron Lehmann c0eebabe70 Service update failure thresholds and rollback
This adds support for two enhancements to swarm service rolling updates:

- Failure thresholds: In Docker 1.12, a service update could be set up
  to either pause or continue after a single failure occurs. This adds
  an --update-max-failure-ratio flag that controls how many tasks need to
  fail to update for the update as a whole to be considered a failure. A
  counterpart flag, --update-monitor, controls how long to monitor each
  task for a failure after starting it during the update.

- Rollback flag: service update --rollback reverts the service to its
  previous version. If a service update encounters task failures, or
  fails to function properly for some other reason, the user can roll back
  the update.

SwarmKit also has the ability to roll back updates automatically after
hitting the failure thresholds, but we've decided not to expose this in
the Docker API/CLI for now, favoring a workflow where the decision to
roll back is always made by an admin. Depending on user feedback, we may
add a "rollback" option to --update-failure-action in the future.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6d4b527699b3e95d21d79f6b327252a6cdaca5b0
Component: engine
2016-10-18 10:09:50 -07:00
Tonis Tiigi bcbed9fbcc Don’t attempt to reconnect swarm on failed join after timeout
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7381c84bfb9d586a5a7b87a9d6bcaf3ee15a4256
Component: engine
2016-10-03 13:38:01 -07:00
Yong Tang 562ec15f92 Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
Jana Radhakrishnan c42acbfe8e Add GetListenAddress in ClusterProvider
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: fbcdca7ebcd45d74c40fbccbb07f2d3decfb8628
Component: engine
2016-09-22 21:00:32 -07:00
Daniel Nephin d47b1c8a71 Move errors/ to api/errors
Using:
        gomvpkg -from github.com/docker/docker/errors
                -to github.com/docker/docker/api/errors
                -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c452e1bfe6b19d44bf2ed2a1eb8aef7e23d6bafb
Component: engine
2016-09-16 12:27:13 -04:00
Jana Radhakrishnan e77039e819 Merge pull request #26551 from cpuguy83/26548_fix_tasks
Do not look at `Attachment` tasks in /tasks
Upstream-commit: 3ae023cd2286188158f7a7ed356b63df63f00d09
Component: engine
2016-09-13 21:27:15 -07:00
Brian Goff 58f4fbdb5f Do not look at Attachment tasks in /tasks
Fixes #26548

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 15eee038c0b06b4f0ae1bf12bebbb9a1f5deec78
Component: engine
2016-09-13 20:44:06 -04:00
Jana Radhakrishnan 293cb24e33 Fix autostart for swarm scope connected containers
The swarm scope network connected containers with autostart enabled
there was a dependency problem with the cluster to be initialized before
we can autostart them. With the current container restart code happening
before cluster init, these containers were not getting autostarted
properly. Added a fix to delay the container start of those containers
which has atleast one swarm scope endpoint to until after the cluster is
initialized.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c9fb551d60584ac4ad01561e2f56b7b7cc9483b9
Component: engine
2016-09-13 14:21:58 -07:00
Jana Radhakrishnan f0d30a4b26 Add support for docker run in swarm mode overlay
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99a98ccc14a9427be47c8006e130750710db0a16
Component: engine
2016-09-07 21:20:41 -07:00