Commit Graph

497 Commits

Author SHA1 Message Date
Nishant Totla 7de9f6ee62 Moving over images to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-30 09:46:38 -07:00
Morgan Bauer 4516d1ae16
use apiClient for volumes management
- create volume
 - list volumes

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 15:01:27 -07:00
Morgan Bauer 0be5b31f27
use apiClient for listing networks in refresh
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer 08a475d661
use apiClient for removing volumes
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer cac3943680
use apiClient for removing networks
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Morgan Bauer 1e22226b71
use apiClient for removing images
- remove unused argument
 - unit test of new client

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-03-29 14:50:22 -07:00
Victor Vieux 3461df4032 Merge pull request #2042 from vieux/update_build
support private images, labels and other new flags in docker build
2016-03-28 22:50:28 -07:00
Nishant Totla 0ebb26bdd4 Printing engine version in Info
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-28 17:40:50 -07:00
Nishant Totla 4db4e951c7 Merge pull request #2031 from allencloud/fix-minor-typo
fix minor typo
2016-03-27 18:36:32 -07:00
Sun Hongliang da7128cc16 fix minor typo
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-26 10:33:11 +08:00
Sun Hongliang ec0c3f7bbd output error when starting a rescheduled container fails.
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-25 19:28:46 +08:00
Victor Vieux e98cf00409 support private images, labels and other new flags in docker build
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-24 18:27:20 -07:00
Dongluo Chen 69c44967be Merge pull request #2017 from allencloud/fix-typos-in-mesos
fix typos in /swarm/cluster/mesos/cluster.go
2016-03-24 10:12:11 -07:00
Xian Chaobo dcf2608798 Merge pull request #1992 from dongluochen/AddNodeSpecUpdate
Periodically update node spec
2016-03-24 20:36:32 +08:00
Sun Hongliang 3843dbb381 fix typos in /swarm/cluster/mesos/cluster.go
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-24 10:49:28 +08:00
Dong Chen 0436dd1f26 An endpoint is duplicate/stale if its ID is part of endpoint index.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 14:10:57 -07:00
Dong Chen d045bd44e0 Skip redundant endpoints in "network inspect"
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-22 10:19:22 -07:00
Nishant Totla 1e821e48ed Plumbing context through all calls to engine-api client
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-18 14:55:05 -07:00
Dong Chen 040f63cd47 Force node spec update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-18 10:23:39 -07:00
Victor Vieux 9de8f77d55 Merge pull request #1986 from allencloud/move-experiemental-about-rescheduling-out-of-config
move more details about rescheduling out of experimental
2016-03-17 11:00:56 -07:00
Sun Hongliang 4b04286f90 fix typos in watchdog
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-17 22:20:26 +08:00
Sun Hongliang 129f38366e move more experimental out of rescheduling
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-17 20:13:46 +08:00
Dong Chen b61dfa7497 Force inspect for containers in Restarting state.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 18:43:37 -07:00
Victor Vieux 0744188c9b Merge pull request #1981 from dongluochen/ContainerRestartEvent
Docker restart event should trigger container inspect
2016-03-16 17:20:18 -07:00
Dongluo Chen 85f6d57f21 Merge pull request #1972 from vieux/pass-host-config
HostConfig for /start endpoint
2016-03-16 17:19:29 -07:00
Dong Chen c35d95fac4 Docker restart would change container state. Should do a container inspect to update status.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 16:27:35 -07:00
Victor Vieux 968aae4f9c Merge pull request #1977 from dongluochen/RetryEventMonitor
Swarm manager should retry EventMonitoring on failure
2016-03-16 15:59:44 -07:00
Dong Chen 26931816c4 Manager should retry EventMonitoring on failure.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-16 15:35:22 -07:00
Victor Vieux 56affa1ada fix image matching via id
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-16 15:12:56 -07:00
Victor Vieux b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07:00
Sun Hongliang 172048942d fix typos.
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-14 11:21:59 +08:00
Dongluo Chen 957f81036b Merge pull request #1943 from nishanttotla/removing-dead-code
Deleting redundant code from volume.go
2016-03-11 13:44:48 -08:00
Yongqiao Wang 134df4293c Support rescind offer in swarm.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-03-11 11:13:56 +08:00
Nishant Totla 8cbffa9492 Deleting redundant code from volume.go
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-10 14:14:28 -08:00
Nishant Totla ba31ab2d4b Merge pull request #1872 from echupriyanov/volume_info_fix
Fix get volume call for volumes with non-local drivers
2016-03-10 13:47:14 -08:00
Nishant Totla 6af37c4888 Updating info function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-09 13:58:50 -08:00
Nishant Totla 453304c795 Updating version function to use engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 17:46:24 -08:00
Nishant Totla d4cfba1844 Adding engine-api client
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-03-07 15:05:43 -08:00
Dong Chen e0583ea7d7 Prevent crash on channel double close.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-07 11:48:01 -08:00
Sun Hongliang c34a45023f fix typos in a test file and a function annotation
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-03-05 00:39:15 +08:00
Eugene Chupriyanov 05d9995985 Proposed fix for https://github.com/docker/swarm/issues/1847
* Fix cluster.Volumes.Get() call for volumes with non-local drivers
* Added tests for clusterVolumes.Get()

Signed-off-by: Eugene Chupriyanov <tchu@tchu.ru>
2016-03-02 13:40:32 +03:00
Dong Chen 87a03b9157 Close TCP connections at disconnect.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-03-01 13:48:58 -08:00
Doug Davis 4dc645bb8a Add missing 'defer'
as it stands now the lock at this spot in the code is pretty useless.
All it does it block us but since we release the lock before we check
e.state its a roadblock with no real purpose.
One could argue that a lock isn't needed at all but I think having it
there for consistency with the other funcs would be good.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-02-29 13:51:10 -08:00
Yongqiao Wang ddce40187c Find some typos when browse the code, fix them in this patch.
Signed-off-by: Yongqiao Wang <yqwyq@cn.ibm.com>
2016-02-26 20:16:39 +08:00
Sun Hongliang aa6ff494e4 Fix #1873
force to validate whether engine's label is like format "key=value"

Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-02-25 12:58:25 +08:00
Victor Vieux 22fedf0db0 support docker run --net <node>/<network>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-23 13:13:31 -08:00
Victor Vieux 854cad3c14 don't erase hostconfig on refresh
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-18 10:01:26 -08:00
Victor Vieux c42142e408 Revert "Passing HostConfig for /start endpoint"
This reverts commit 6ff0d29c9d.

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-17 15:46:37 -08:00
Nishant Totla 6ff0d29c9d Passing HostConfig for /start endpoint
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-17 11:06:51 -08:00
Dong Chen bfc556613b Lock engine to prevent simultaneous change on `containers` map.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-02-12 15:34:15 -08:00