Commit Graph

2684 Commits

Author SHA1 Message Date
Nathan LeClaire 6db82141f0 Bail on failed SSH command with information about what failed
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-21 14:49:24 -07:00
Evan Hazlett 066ef3c4f4 Merge pull request #1550 from moxiegirl/update-docs-dockerfile
Updating to point to latest build
2015-07-20 09:39:20 -04:00
Mary Anthony 60be68c73c Updating to point to latest build
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:44:46 -07:00
David Gageot 8aa5e0771a Support static IP by name on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-19 16:31:05 +02:00
David Gageot 8ce161e830 Support Preemptiple instances on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-18 08:18:35 +02:00
David Gageot e5a7059289 Support static IP on GCE
Signed-off-by: David Gageot <david@gageot.net>
2015-07-18 08:17:50 +02: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
Martin Schygulla 64e21418dd Merge branch 'master' of https://github.com/docker/machine into enhanced-vmwarefusion-driver 2015-07-16 00:33:14 +02:00
Nathan LeClaire 2c36635dd4 Merge pull request #1377 from nathanleclaire/integration_rm_rm
Make some clean ups and fixes to the integration tests
2015-07-15 11:52:02 -07:00
Nathan LeClaire f74d71741f Merge pull request #1525 from tg123/stdout
change inspect output to stdout (was stderr)
2015-07-15 10:46:42 -07: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
Nathan LeClaire e054d06163 Merge pull request #1490 from moxiegirl/split-out-docs
First stage of splitting out
2015-07-14 18:26:22 -07:00
Mary Anthony 39806c02e0 First stage of splitting out
Splitting out docs
Fixing location of help
entering in changes from testing
Filling in some missing structure
Updating with the comments from Nathan
Updating with the comments from Nathan
Updating after talk with Evan/Nathan

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-14 12:44:56 -07:00
Nathan LeClaire 70238f79ad Merge pull request #1300 from hairyhenderson/restart-suggest-rerun-env-1298
Warning user that the active machine was restarted and may have a new IP
2015-07-14 11:52:51 -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 4d0fdaadd4 Merge pull request #1519 from ehazlett/docs-remove-install-links
remove direct install links
2015-07-13 17:33:54 -07: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
Evan Hazlett 09a73a2373
remove direct install links
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-13 18:20:42 -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
Evan Hazlett 95a37e0f1b Merge pull request #1496 from nathanleclaire/synthcpu
Remove synthcpu flag for Virtualbox 5 support
2015-07-11 19:51:18 -06:00
Martin Schygulla 6726ce915e Merge branch 'master' into enhanced-vmwarefusion-driver 2015-07-11 22:40:50 +02: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 1fceba1554 Merge pull request #1499 from chantra/debian_systemd_enabled
[debian] Make enabling docker service work
2015-07-10 15:08:03 -07:00
Emmanuel Bretelle 36ec026b38 [debian] Make enabling docker service work
Fixes #1495
/etc/systemd/system/docker.service was missing the [Install] section
making the enable action fail with:

```
root@jessie:~# systemctl enable docker
Synchronizing state for docker.service with sysvinit using
update-rc.d...
Executing /usr/sbin/update-rc.d docker defaults
Executing /usr/sbin/update-rc.d docker enable
The unit files have no [Install] section. They are not meant to be
enabled
using systemctl.
Possible reasons for having this kind of units are:
1) A unit may be statically enabled by being symlinked from another
unit's
   .wants/ or .requires/ directory.
2) A unit's purpose may be to act as a helper for some other unit which
has
   a requirement dependency on it.
3) A unit may be started when needed via activation (socket, path,
timer,
   D-Bus, udev, scripted systemctl call, ...).
```

Signed-off-by: Emmanuel Bretelle <chantr4@gmail.com>
2015-07-10 00:10:39 -07:00
Nathan LeClaire 8089e222c3 Remove synthcpu flag for Virtualbox 5 support
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-09 10:42:46 -07: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
Evan Hazlett 1620133970 Merge pull request #1263 from nathanleclaire/remove_top_level_migration
Remove flat (0.1.0) => nested (0.2.0) migration code
2015-07-08 16:02:35 -06:00
Evan Hazlett 288de9c9f1 Merge pull request #1264 from nathanleclaire/migrate_to_go_1.4.2
Update Go version to 1.4.2
2015-07-08 16:02:11 -06:00
Evan Hazlett 0dc1d417ac Merge pull request #1487 from nathanleclaire/fix_paused_start
Fix choke when starting from Saved state
2015-07-07 16:54:19 -06:00
Nathan LeClaire 9053ee24c7 Fix choke when starting from Saved state
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-07 14:36:21 -07:00
Nathan LeClaire 83a8a4c0f8 Merge pull request #1310 from exoscale/feature/exoscale-multiple-security-groups
exoscale: ability to specify multiple security groups on instance creation
2015-07-07 11:22:44 -07: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
Martin Schygulla 66114abb0d Improved handling of boot delays until VM comes online
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-07 04:18:49 +02:00
Evan Hazlett 306aed635d Merge pull request #1477 from nathanleclaire/lil_doc_fixups
Fix some docs issues
2015-07-06 20:54:52 -04:00
Nathan LeClaire eabe07294d Fix some docs issues
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-06 16:46:15 -07:00
Nathan LeClaire 0f36a14a67 Merge pull request #1388 from frastel/patch-1
Added command for making the docker binary executable in the docs
2015-07-06 16:20:59 -07:00
Nathan LeClaire cac4795d81 Merge pull request #1404 from danielsoro/patch-1
docs: VMware environment vars / CLI options are mismatched
2015-07-06 15:24:19 -07:00
Evan Hazlett 9d5dff8966 Merge pull request #1470 from nathanleclaire/b2d_hostname
Set boot2docker hostname properly
2015-07-06 16:19:04 -04:00
Nathan LeClaire fd35c7df48 Set boot2docker hostname properly
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-06 13:11:07 -07:00
Martin Schygulla e7e68149e5 Enhanced driver for VMWare Fusion to support configuration data for cloud-init.
The userdata is injected into the VM as an ISO via the cdrom.

Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
2015-07-06 00:44:59 +02:00
moxiegirl 654fa91851 Merge pull request #1426 from nathanleclaire/add_logo_to_readme
Add logo to docs
2015-07-02 17:46:55 -07:00
Vincent Bernat 6a0e3ee0a5 exoscale: reuse "SecurityGroup" variable in "struct Driver"
Since the content of `struct Driver` is serialized to disk, any change
is problematic. A workaround is to keep using the `SecurityGroup` member
as a string (a comma-separated list of security groups).

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 11:09:13 +02: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
Vincent Bernat 5ba232227e exoscale: ability to specify multiple security groups on instance creation
Without this feature, when a user needs a specific security group (i.e
most of the time if they want to expose a service to Internet), they
need to copy the rules needed for Docker itself into each custom
group. With this feature, they can spawn new instances with
`--exoscale-security-group docker-machine,my-custom-group`.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-30 10:59:23 +02:00