Commit Graph

78 Commits

Author SHA1 Message Date
Kazuyuki SUZUKI 2bc53a6ac3 Add argument assertion to inspect/status/url commands
Signed-off-by: Kazuyuki Suzuki <kechol28@gmail.com>
2015-10-01 14:15:29 +09:00
Alexey Grachov b970dddc8b Remove dead code.
Function getMachineDir is not used.

Signed-off-by: Alexey Grachov <grachov.alexey@gmail.com>
2015-09-29 20:30:20 +03:00
Nathan LeClaire 0a2b9c2784 Fix flag accidentally left out in PR carry
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 17:57:52 -07:00
Fabian Ruff d22a4118d0 --no-proxy flag for env command
This optinal flag will add the docker host to the no_proxy environement variable. This is useful for local providers (e.g. virtualbox, fusion) in environments where an http_proxy is set and docker by default tries to connect to the ip via the proxy.

Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-09-23 14:48:01 -07: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
Nathan LeClaire 2a15d98575 First steps to make ssh command smoother
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-21 12:16:47 -07:00
Nathan LeClaire 993b5f557f Merge pull request #1810 from xiaohui/cleanup
cleanup log.*ln and correct typos error
2015-09-16 16:38:40 -07:00
Matt McNaughton a0b9d179b1 Fix Go Vet errors
This commit makes no changes to code execution, but rather resolves some
`go vet` errors, the majority of which relate to `fatal` being used
instead of `fatalf` during testing.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
2015-09-14 22:37:16 -04:00
Xiaohui dcdd1a4757 cleanup log.*ln, unuseful methods, some typos error …
1. cleanup log.*ln for #1081
2. add "\n" to config command
3. typos error
4. remove unuseful methods: getBasedir@commands.go, and
GetDefaultTestHost@commands_test

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-09-14 15:25:50 +08:00
Soshi Katsuta 6496c44261 commands: show "-" in the ACTIVE column for inactive machines
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 01:04:48 +09:00
Evan Hazlett c1acb74d7a Merge pull request #1508 from ericsage/filter_names
Add name filter for #1488
2015-08-11 06:33:09 -04:00
Dave Henderson fb0af73b80 Verifying the --swarm-discovery flag
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-07-29 08:01:18 -04:00
Eric Sage b333ea5294 Add regex based name filter to ls command.
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add regex support

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Allow bad regex passthrough to reg string amtch

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add unit test

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add integration tests

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add documentation for name filter.

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
2015-07-22 21:06:26 -04:00
Nathan LeClaire 03d4683755 Merge pull request #1503 from sergiobuj/add_status_command
Add status command
2015-07-22 15:55:45 -07:00
Ryan Grothouse d553a2c757 added support for setting environment variables in docker engines
Signed-off-by: Ryan Grothouse <rgrothouse@gmail.com>
2015-07-16 16:12:06 -04:00
tgic d5f3f37d8f change inspect output to stdout (was stderr)
Signed-off-by: tgic <farmer1992@gmail.com>
2015-07-15 20:35:48 +08:00
Sergio Botero 918ed6a135 Add integration test for status command
Use `log.Info` instead of `fmt.Println`

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
2015-07-14 19:10:43 -07:00
Sergio Botero 87cf7e222e Add status command
closes #1471 by adding the status command that prints the state of a
machine.

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
2015-07-14 19:10:40 -07:00
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