Commit Graph

188 Commits

Author SHA1 Message Date
NanXiao a897e53dcc Fix typo in cluster/swarm/cluster.go
Signed-off-by: NanXiao <nan@chinadtrace.org>
2016-06-17 19:40:55 +08:00
Doron Podoleanu 6d5638b95b Create in engine.go renamed to CreateContainer (#2283)
* Create in engine.go renamed to CreateContainer

Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-06-15 16:56:03 -07:00
Dongluo Chen b3205ca161 Merge pull request #2288 from nishanttotla/refactoring-img-handling
Refactoring code around image ref generation
2016-06-14 14:34:20 -07:00
Xian Chaobo 453d71753e Merge pull request #2144 from allencloud/show-container-status-of-node-in-docker-info
show container status of each node in docker info
2016-06-06 10:32:27 -05:00
Allen Sun d9abab6ca9 Merge pull request #2261 from allencloud/remove-engine-in-volume-create-response
remove engine details in POST /volumes/create API
2016-06-04 11:48:14 +08:00
Dongluo Chen 416a781b64 Merge pull request #2281 from xianlubird/feature/scheduler_log
Add scheduler detail log for node
2016-06-03 10:41:37 -07:00
xianlubird 61f3441d07 Add scheduler detail log for node info
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com>
2016-06-02 09:27:55 +08:00
allencloud d7241f3682 remove engine details in POST /volumes/create API
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 15:12:14 +08:00
Alexandre Beslic 13c9e87a9f Merge pull request #2262 from allencloud/remove-refreshVolumes-not-used
remove unused refreshVolumes in cluster.go
2016-05-27 14:10:41 -07:00
Nishant Totla e782541d99
Refactoring code around image ref generation
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-26 10:37:39 -07:00
Nishant Totla 82f1bfe0ec
Changing relevant function calls for updated engine-api
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-05-25 15:47:06 -07:00
allencloud 7d5ef9016d remove not used refreshVolumes in cluster.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-23 00:35:37 +08:00
Sun Hongliang b1f42fb8cc hide error in info when empty
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-08 15:32:19 +08:00
Sun Hongliang a28e2e7e30 fix typos in swarm/cluster.go
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-06 11:16:37 +08:00
Dong Chen d6e6703e29 Prevent double RLock() of RWMutex. It may lead to deadlock if there is Lock() call from another goroutine in between.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-05-05 10:45:34 -07:00
Sun Hongliang 8a5531777b show container status of each node in docker info
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-04 17:23:45 +08:00
Nishant Totla b69728a2c5 Merge pull request #2196 from allencloud/fix-typos
fix typos in test and other files
2016-05-01 16:54:33 -07:00
Sun Hongliang 6cd8a06c8f fix typos in test and other files
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-05-02 07:29:33 +08:00
Victor Vieux c07a84529d Merge pull request #2175 from nishanttotla/remove-type-conversions
Remove type unnecessary type conversion
2016-04-27 18:09:51 -07:00
Sun Hongliang 8cca29e9a9 add NodeID in docker info
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 08:30:30 +08:00
Nishant Totla c70f836e88
Remove type unnecessary type conversion
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-26 13:42:17 -07:00
Nishant Totla ff0c79e08d
Fix image pull bug (wait until download finishes)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:37:00 -07:00
Nishant Totla 11df80601c
Updating cluster
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Nishant Totla 81e1528d0f
Updating API handlers
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-14 09:36:59 -07:00
Sun Hongliang d403254ed2 1.validate cluster option swarm.overcommit
2.change swarm.createretry's error info and add its integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-07 09:00:41 +08:00
Victor Vieux 5e13bcf8ff use engine-api for network create
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-25 15:35:04 -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 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
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
Victor Vieux b05dee4d6e HostConfig for /start endpoint
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-03-14 19:23:57 -07: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
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 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
Victor Vieux cd3b1d5bd1 improve addNetwork
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 11:00:15 -08:00
Victor Vieux 3747ec9b9f change refresh logic with new events
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-10 00:48:31 -08:00
Victor Vieux 5492f4ab82 remove refresh networks
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-09 20:14:58 -08:00
Nishant Totla 16de94b9b1 Adding default name (unknown) for pending engine
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-02-01 12:54:37 -08:00
Victor Vieux 336a4ff9ae Merge pull request #1721 from nishanttotla/1625-RemoveInfoBackspaces
Removing backspaces in /info output for new API version
2016-02-01 09:30:51 -08:00
Nishant Totla 3d7678389f Removing backspaces in /info output for new API version
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-01-31 23:54:33 -08:00
Isabel Jimenez c809e6a643 Fix double start
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2016-01-31 19:08:48 -05:00
Victor Vieux f3a1027bbe update docker info
add test

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-27 01:07:52 -08:00
Dong Chen abffebf09e Provide error when engine version is unsupported.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-25 15:58:48 -08:00
Victor Vieux 1225eddc79 allow engine/name support in volumes
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-16 17:40:53 -08:00
Dong Chen 39dc28a4df Fix a race condition in pending engine validation, discard parallel validation result.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-19 16:19:09 -08:00
Dong Chen 8cc9b6c284 Add swarm container create retry option.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-13 16:06:38 -08:00
Victor Vieux fc1e7bbca2 use docker/docker/pkg/discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-12 00:38:06 -08:00
Victor Vieux a2018c177c improve eventHandlers locking
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 17:23:48 -08:00