ece52698d6
Merge pull request #783 from vieux/fix_image_match
...
fix image.Match to take only repo or repo:tag
2015-05-13 19:05:30 -07:00
f9b457f152
fix image.Match
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 17:36:08 -07:00
69bdf1a87b
fix heartbeat default value
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 16:50:01 -07:00
59cd11b946
change swarm.heartbeat to swarm.discovery.heartbeat
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:48:07 -07:00
5db3a9cd0e
remove options struct, yay!
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-13 15:36:30 -07:00
c29404e272
add --cluster-driver and --cluster-opt
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-12 17:49:00 -07:00
b6a7c3d7f5
swarm ID: Remove backward compatibility.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
5c801d2c6a
swarm id: Handle compatibility.
...
Containers created with Swarm<0.3.0 or directly on the host without
going through Swarm don't have a Swarm ID. We are going to fake it by
using the Container ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:08 -07:00
abfe5e6f4c
Add support for Swarm IDs.
...
- Every container that gets created through Swarm gets a Swarm ID
assigned (as a label).
- All API operations (start, stop, ...) can be performed by using either
the container ID or the swarm ID.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:07 -07:00
054702fedc
container config: Add Swarm ID helpers.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-11 16:56:07 -07:00
0bd4b1faca
Merge pull request #732 from vieux/fix_name_unique
...
fix name checks in create and rename
2015-05-07 16:24:16 -07:00
a74d00d1c5
fix name checks
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-07 15:50:34 -07:00
5ee115fcd5
container: Use state strings from dockerclient instead of embedding
...
them.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-07 15:42:26 -07:00
8a00a5ff10
engine: Force full refresh when container changes state.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
4cf0a32e4d
container: Add Status() and StateString() formatters.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-06 23:38:32 -07:00
7865004ec9
Merge pull request #725 from aluzzardi/discovery-integration-cleanup
...
Discovery integration cleanup
2015-05-06 10:50:11 -07:00
9124f3a0c7
cluster: Improved discovery duplication error messaging.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-05 19:13:57 -07:00
1d2e073813
Embed ContainerConfig into Container.
...
The cluster configuration is now embedded into the container. It's
guaranteed to be correct (as in, generated by BuildContainerConfig) at
all times.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 18:15:22 -07:00
cd3a0f03fc
container config builder: Make all modifications on a copy, never alter original.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 18:06:26 -07:00
67fbac56a6
cleanup config asserts
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-30 15:35:46 -07:00
f53b5df834
store constaints and affinities in labels
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 14:33:21 -07:00
6eceffacf9
use cluster.ContainerConfig
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-30 11:44:25 -07:00
e5f4243dad
support pulling private images from docker pull
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-28 11:17:44 -07:00
40a3eb1aa1
fix return value
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 21:35:46 -04:00
24396d8509
Merge pull request #669 from jimmyxian/improve-rename
...
improve rename
2015-04-27 12:39:48 -07:00
3d2537eb84
move check into cluster and rename func
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-27 08:20:55 -04:00
b47e002e6c
improve rename and update dockerclient
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-24 21:09:26 -04:00
d6011b4bc6
Merge pull request #609 from jimmyxian/add-support-imageload
...
Add support "docker load" api
2015-04-24 17:21:11 -07:00
9f29e95abc
Add Node Labels to Cluster Info information
...
Updates: docker info output and /info API
Check for labels in API integration tests
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-21 20:30:19 +00:00
5c068de28c
add force-refresh when commit/tag/pull
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-20 02:45:06 -04:00
0b44d9615b
add force fresh images
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-19 23:02:26 -04:00
59c5b6b317
use WaitGroup and move test in api.bats
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 22:10:39 -04:00
6ad2a7847c
stream load and output nothing if load successfully
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
34e0c78d1d
gofmt check
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
ccc32635d5
Add support Load Image
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-04-16 21:50:46 -04:00
9ac7dd2402
Merge pull request #603 from vieux/add_build
...
Proposal: Add build support on a random node
2015-04-16 16:21:38 -07:00
05b01c7b43
forcerefresh after build and add test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-16 12:22:09 -07:00
4db132e20e
Merge pull request #594 from noxiouz/add_rlocks_to_swarm_cluster
...
Add Rlocks to swarm cluster
2015-04-16 12:20:58 -07:00
d74e872952
add build
...
improve random selection
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:19:09 -07:00
8506acbed2
fix proxyRandom even without container
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-16 12:17:38 -07:00
442217d6dc
Cleanup events handler.
...
- Renamed Events() to RegisterEventHandler() in Engine.
- Added RegisterEventHandler() to the Cluster interface.
- Removed EventHandler requirement from swarm's Cluster constructor.
- Make API's events handler private.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 15:59:55 -07:00
49f644934c
Improve Error message to show node's Name and IP
...
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-14 11:27:02 -07:00
b174aa26de
Change heartbeat type to unsigned int
...
Check if heartbeat value is greater than zero
Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-09 00:04:50 +00:00
2b4bbf1ef2
[SwarmCluster] Add RLock to Cluster.Pull
...
Use sync.WaitGroup (go-way) to wait for a collection
of pulling goroutines.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 22:30:23 +03:00
b221baf4ed
[SwarmCluster] Add RLock to Cluster.hasEngine
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 22:25:54 +03:00
e66abdf7bb
[SwarmCluster] Remove an extra RLock in Engine.Container
...
Engine.Container uses an array of containers from Engine.Containers, which is
built under an internal RLock, so the external RLock is useless.
Also allocate enough memory for the array of containers (images).
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
2015-04-08 00:41:28 +03:00
853aaf6027
nodes -> engines
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-07 11:46:33 -07:00
0c1782c7c0
fix proxyRandom and cleanup node -> engine
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:38:10 -07:00
1297a4cef2
transform node interface to engine struct
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-06 13:19:37 -07:00
88b69e0671
Merge pull request #573 from aluzzardi/container-update-fix
...
Fix container update flow.
2015-04-03 17:03:14 -07:00
820527be7e
Sort docker info by name
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 16:37:27 -07:00
23d52249fa
Fix container update flow.
...
This guarantees that containers get fully updated before being inserted
in the node (and returned by .Containers()).
Fixes #560
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-03 16:21:48 -07:00
20ec7a889e
add strategy and filters to docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-03 15:56:26 -07:00
c41d73dd50
add error message
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-04-03 01:28:08 +00:00
58b282a4a3
Merge pull request #545 from aluzzardi/synchronous-creater-destroy
...
Make container creation and destruction synchronous.
2015-04-01 15:41:26 -07:00
b304a453f4
use 1024 as total cpushare for a machine
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-04-01 11:49:00 -07:00
ca05173e41
Make container creation and destruction synchronous.
...
This is in order to fix race conditions. Currently, container creation
can happen in parallel which means that the scheduler operates on stale
data.
Fixes #427
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-31 14:11:51 -07:00
d87c48ae4e
Fix lint violations
...
This changeset fixes all lint violations that show up with a
min_confidence of 1
- Issue #500 : Run golint on codebase
Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-27 21:17:44 -06:00
904c720ea5
Merge pull request #446 from vieux/rmi
...
add docker rmi
2015-03-24 16:04:35 -07:00
64d01b4e4a
add fixme
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-19 10:02:33 -07:00
e6b3b04150
do not leak dockerclient
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-18 13:48:09 -07:00
c969fcdae6
use dockerclient
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
b4a88ad622
Add match in images.go
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
649b6cf577
add docker rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 17:41:46 -07:00
8c09bba1de
mitigate race in pull while we wait for a proper store
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-17 23:29:42 +00:00
b9e600d38d
pull only latest if no tag
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-03-17 16:19:35 -07:00
de62579f8d
handle errors in pull
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-11 14:34:47 -07:00
0fca58b069
add Node back to inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-06 16:40:55 -08:00
0e7f970d4d
use a single callback
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-06 11:22:14 -08:00
e0fa132ec9
add parallel
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 17:09:08 -08:00
7ad8a3705f
add support for pull and rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 17:09:08 -08:00
eccaf6e5eb
Cleanup: Make swarm Node and Cluster functions private
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-05 11:53:40 -08:00
0569f7d4dd
swarm.Node -> swarm.node && some method now private
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-02 18:02:31 -08:00
92ab1e347c
cleanup swarm scheduler code
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-02 17:55:06 -08:00
8b7afe2c73
remove mesos.go to move it to it's own PR
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
a8885ab997
removed nodes.go
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
d8042f9677
add Node interface
...
Usable -> Total & Reserved -> Used
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
4bfeb4b640
move list of node to swarm only
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
47e03120f5
remove Nodes(), add Images() and Images()
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
fa8a06685b
remove events from the cluster interface
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
6348fdd849
move discovery out of the cluster interface
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
ce98e66c63
cluster API instead of scheduler API
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
126f550317
add SchedulerOptions
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
dd537dbe74
clean cut cluster - scheduler
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
98a21bd373
initial mesos.go file full fo TODOs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
150940a67b
update dockerclient
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:17:02 -08:00
67e347fa1a
Move container name matching logic into Node.
...
- Add `Node.Container()`
- Make `Cluster.Container()` use `Node.Container()`
- Added missing locks and converted existing ones to RLock.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-10 13:25:37 -08:00
ba01634743
replace discovery.Node by discovery.Entry
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 01:58:43 +00:00
a0bfcf6733
Node: Connect with the provided address instead of resolving the IP.
...
When used with `--tlsverify`, connecting with the IP forced daemon
certificates to use an IP in `subjAltName`.
Related to #341
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-04 13:10:27 -08:00
ec7d343a88
Merge pull request #306 from vieux/improve_logs1
...
improve some logs
2015-01-27 12:23:31 -08:00
9ed597b5eb
Do not fail when destroying a container if it's not found in the store.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-27 12:13:58 -08:00
231ded20e0
improve some logs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 23:41:56 +00:00
dc43a156bd
Fix concurrency issue in node.updateContainer.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 14:04:41 -08:00
cafbc6df28
Improve container state refresh.
...
Currently, container inspection is performed only on creation (or during
exec by the API).
The problem is that certain informations such as NetworkSettings are not
available during creation, therefore we must inspect the containers
during other events.
This change refactors a bit the API so that RefreshContainer() and
RefreshContainers() now accept a `full` flag to force a deep refresh.
The node event handler in turn uses that flag whenever a container
starts or dies.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-26 13:39:52 -08:00
fc58587315
fix tests that were not compiling or panicking
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-25 01:42:49 +01:00
4ae79a8ff7
update for dockerclient
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 11:14:38 -08:00
693fb0fcf1
fix panic with no port
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-24 01:42:35 +00:00
02cc59840f
Revert "Fixes panic when ports are not specified"
...
This reverts commit a916f9cde0
2015-01-24 01:42:15 +00:00
a916f9cde0
Fixes panic when ports are not specified
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-23 15:56:14 -05:00
2e968d7800
add support for history, inspect for images and improve inspect for containers
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 00:49:02 +00:00
Andrea Luzzardi
Victor Vieux
Xian Chaobo
Sriram Natarajan
Victor Vieux
Anton Tiurin
Alexandre Beslic
Matt Bajor
Alexandre Beslic
Pierre Wacrenier
Brian Goff