Commit Graph

22 Commits

Author SHA1 Message Date
Tiago Pires 63ea976b1d FIX #1858 Add engine port
Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on
Docker engine.
Updated `generic` driver documentation.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-11 13:13:30 +00:00
Miquel Sabaté Solà 7e201c4005 Added a flag to enable experimental Swarm features
The `create` command now has the `--swarm-experimental` boolean flag, that
tells the Swarm provisioner to enable experimental features in Swarm.

Fixes #2861

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
2016-02-13 12:21:20 +01:00
Nathan LeClaire 265dd37594 Add correct Swarm port bindings
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-28 15:51:41 -08:00
Patrik Erdes 92b9853478 Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
Signed-off-by: Patrik Erdes <patrik@erdes.se>
2016-01-22 14:51:59 +01:00
Kunal Kushwaha 30a2e8e068 Configures swarm-master with failover support
If more then one master is created with same discovery backend,
Rest of master will be configured as replica of primary master

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2016-01-14 09:46:15 +09:00
Dustin Blackman 288fddb736 set swarm manage to advertise on 3376
Signed-off-by: Dustin Blackman <dev@dustinblackman.com>
2016-01-06 15:08:31 -05:00
David Gageot 61fed5c11b Merge pull request #2728 from dgageot/update-docker-client
FIX #2703 Update dockerclient dependency
2016-01-04 16:02:30 +01:00
David Gageot d8fb917cd8 FIX #2703 Update dockerclient
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 11:33:33 +01:00
Jacob Blain Christen 94329a6e06 fix swarm provision issue #2715: invalid restart policy
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2015-12-30 19:27:59 -07:00
David Gageot 946712b1f7 Fix vet issues
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:30:50 +01:00
David Gageot 670c4808ed FIX #2663 reduce calls to the driver in ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 13:58:06 +01:00
Kunal Kushwaha f3689349a4 Host provisioing using Docker API
Replaces the code of provisioing with Go Templates with DockerAPI

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-09 13:05:43 +09:00
David Gageot 53a7528e4d Merge pull request #2515 from drankinn/2342_replication_advertise
Fixes issue #2342 - Issue provisioning swarm master with --replication through Docker Machine
2015-12-08 10:55:47 +01:00
Lance Andersen 60dba4d2d5 added advertise flag to swarm manager
Signed-off-by: Lance Andersen <techlance@gmail.com>
2015-12-07 12:37:26 -07:00
dongmx ce524e1740 Swarm container net should be host. If use bridge, sometime container ip addresses conflict.
Signed-off-by: dongmx <dongmx@xueqiu.com>
2015-12-03 19:11:34 +08:00
Kunal Kushwaha 055de5f276 BugFix: IP in template need as per Struct
Lint changes in SwarmCommandOptions chnaged `Ip` to `IP`.
It required change in template code also.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-06 15:47:15 +09:00
Olivier Gambier d2ada6488c Lint
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
Kunal Kushwaha 8d2ae162b7 Environment variables passed to provision machine, will be passed to containers for swarm also.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-05 11:27:58 +09:00
Nathan LeClaire b5927f10c4 Make libmachine usable by outside world
- Clear out some cruft tightly coupling libmachine to filestore

- Comment out drivers other than virtualbox for now

- Change way too many things

- Mostly, break out the code to be more modular.

- Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

- Fix mis-managed config passthru

- Remove a few instances of state stored in env vars

- This should be explicitly communicated in Go-land, not through the
shell.

- Rename "store" module to "persist"

- This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

- Rip out repetitive antipattern for getting store

- This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

- Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

- First steps towards fixing up tests

- Test progress continues

- Replace unit tests with integration tests

- MAKE ALL UNIT TESTS PASS YAY

- Add helper test files

- Don't write to disk in libmachine/host

- Heh.. coverage check strikes again

- Fix remove code

- Move cert code around

- Continued progress: simplify Driver

- Fixups and make creation work with new model

- Move drivers module inside of libmachine

- Move ssh module inside of libmachine

- Move state module to libmachine

- Move utils module to libmachine

- Move version module to libmachine

- Move log module to libmachine

- Modify some constructor methods around

- Change Travis build dep structure

- Boring gofmt fix

- Add version module

- Move NewHost to store

- Update some boring cert path infos to make API easier to use

- Fix up some issues around the new model

- Clean up some cert path stuff

- Don't use shady functions to get store path :D

- Continue artifact work

- Fix silly machines dir bug

- Continue fixing silly path issues

- Change up output of vbm a bit

- Continue work to make example go

- Change output a little more

- Last changes needed to make create finish properly

- Fix config.go to use libmachine

- Cut down code duplication and make both methods work with libmachine

- Add pluggable logging implementation

- Return error when machine already in desired state

- Update example to show log method

- Fix file:// bug

- Fix Swarm defaults

- Remove unused TLS settings from Engine and Swarm options

- Remove spurious error

- Correct bug detecting if migration was performed

- Fix compilation errors from tests

- Fix most of remaining test issues

- Fix final silly bug in tests

- Remove extraneous debug code

- Add -race to test command

- Appease the gofmt

- Appease the generate coverage

- Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

- Move Get to Load
- Move HostListItem code to CLI

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 12:30:15 -07:00
Evan Hazlett 030783af74
swarm: use --advertise instead of --addr for join
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 13:15:00 -04:00
Evan Hazlett cf0aee9fd7
support specifying swarm image and docker versions
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-01 16:20:56 -04:00
Nathan LeClaire 47bd262260 Implement configurable Swarm options
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-26 10:18:34 -07:00