Commit Graph

60 Commits

Author SHA1 Message Date
Dave Henderson f2284b2bd5 Just informing the user that re-eval may be necessary, instead of going to the trouble of trying to detect IP changes
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-13 20:36:05 -04:00
Dave Henderson 07f2972dda Warning user that the active machine was restarted and may have a new IP
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-13 20:34:19 -04:00
Nathan LeClaire cd55ca0030 Merge pull request #1506 from ericsage/1502
Return better error for issue #1502.
2015-07-13 17:33:30 -07:00
Eric Sage 6410da8f34 Switch to errors.New
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 20:09:59 -04:00
Eric Sage b75b5d618c Change error message
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-13 17:45:46 -04:00
Evan Hazlett f8456d8bba Merge pull request #1494 from nathanleclaire/rename_machine_to_provider
Rename libmachine.Machine to libmachine.Provider
2015-07-11 20:33:22 -06:00
Eric Sage 8a77935cd4 Return better error for issue #1502.
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-11 00:49:59 -04:00
Nathan LeClaire 3eaab15a5b Rename libmachine.Machine to libmachine.Provider
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-09 10:24:29 -07:00
Evan Hazlett 69dc9fd7f3 Merge pull request #1273 from hairyhenderson/default-driver-impl
refactor: Extracting a base Driver struct
2015-07-09 01:59:05 -06:00
Dave Henderson 3d002187fe Refactoring drivers to embed drivers.DefaultDriver
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-07 11:24:00 -04:00
Vincent Bernat 4ec3f206b4 exoscale: use `StringSlice` to specify security groups
This mean that the option has to be repeated to specify multiple
security groups.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00
Evan Hazlett 7bd70db83b
windows: error message if using powershell/cmd and none specified
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 13:18:15 -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
Evan Hazlett f82032b28d remove provider
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-21 10:41:03 -04:00
Evan Hazlett 91c618fd06 Merge pull request #1174 from nathanleclaire/ssh_backends
Move to using SSH shellout by default, and Go native impl as a backup
2015-05-21 10:22:45 -04:00
Nathan LeClaire 2f78b7f92a Move code to use SSH "backends"
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-19 15:02:57 -07:00
Evan Hazlett 309afd1112 Merge pull request #1175 from hairyhenderson/add-machine-name-envvar-925
Adding new DOCKER_MACHINE_NAME environment variable
2015-05-19 15:28:13 -04:00
Dave Henderson 7b68762d36 Adding new DOCKER_MACHINE_NAME environment variable
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-14 22:43:39 -04:00
Nathan LeClaire 333b7e88a7 Implement docker-machine scp
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-13 17:22:42 -07:00
Evan Hazlett 00a2f7781f env: enable easier usage display
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-12 08:43:15 -04:00
Dave Henderson a3c8b3474e Adding --filter flag to ls command
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-05-11 20:01:50 -04:00
Nathan LeClaire b672617287 Migrate engine-flag => engine-opt
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-11 11:57:09 -07:00
Evan Hazlett f3bcda1cff Merge pull request #1137 from nathanleclaire/fixup
Fix formatting and non-returning of error
2015-05-07 11:52:40 -07:00
Nathan LeClaire 8887ca2fed Fix formatting and non-returning of error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 17:52:29 -07:00
Evan Hazlett 7aa8364a4a Merge pull request #1117 from ehazlett/fix-windows-shell-detection
windows: fix shell detection to not bail on bash envs
2015-05-06 15:54:37 -07:00
Nathan LeClaire 8c34f80940 Fix bug with quiet ls mode
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-06 11:48:16 -07:00
Evan Hazlett 3b0a32f6d8 Merge pull request #1118 from nathanleclaire/fix_env
Fix failing env validation
2015-05-05 14:33:08 -07:00
Nathan LeClaire 6bb56f91d3 Fix failing env validation
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-05 13:51:22 -07:00
Evan Hazlett c4dd9198c1
windows: fix shell detection to not bail on bash envs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 12:19:53 -07:00
Evan Hazlett 7fc50f3de3 add generic driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-05 11:04:47 -07:00
Darren Shepherd 43b5786001 Default storage driver to "" and let provisioner choose default
The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-05 09:12:33 -07:00
Nathan LeClaire c602e69448 Read active host from DOCKER_HOST instead of from file
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-04 16:29:04 -07:00
Evan Hazlett 6a311b0069 Merge pull request #20 from exoscale/feature/exoscale-support
driver: exoscale driver
2015-05-01 16:31:31 -04:00
Evan Hazlett 15fb6c3d79 Merge pull request #1083 from ehazlett/docs-update-env-shell
docs: update usage info for env shell options
2015-05-01 16:11:31 -04:00
Evan Hazlett 092521a346 docs: update usage info for env shell options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-05-01 14:55:50 -04:00
Dave Henderson 3739e4d067 Harmonizing drivers so IPAddress property is kept up-to-date
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-30 19:59:23 -04:00
Vincent Bernat fd569c8fdf driver: exoscale driver
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-30 22:32:02 +02:00
Nathan LeClaire 142ffadc2c Refactor logging to focus on simple STDOUT/STDERR
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-30 12:04:52 -07:00
Evan Hazlett 03c245cf4f Merge pull request #1033 from ehazlett/env-shell-selection
shell selection for env
2015-04-30 14:03:23 -04:00
Evan Hazlett 49686b9a91
better hint for windows shells
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:38 -04:00
Nathan LeClaire 2574c8ba5d Implement configurable engine options
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-29 17:58:14 -07:00
Evan Hazlett 9aa861ea55 update usage hint for powershell
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett 92f6b45de2 env-shell: fixed tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett 6b735677a0 do not hard code machine binary name in env command
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett 33d8058d38 shell selection: fix tests and add powershell test
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett e13e2b61c6 use template for shell config; more powershell and cmd fixes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett 7585680668 add export and clear env for powershell
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett cba15e843f powershell support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:34 -04:00
Evan Hazlett 13e1b1e867 Merge pull request #1058 from hairyhenderson/rm-report-success-on-multi-machines-1053
Reporting success of each machine when removing multiples
2015-04-29 09:21:06 -04:00