Commit Graph

2684 Commits

Author SHA1 Message Date
Anurag Gupta 99544a4cb0 Add Azure Swarm Master Port endpoint configuration when using docker machine.
Signed-off-by: Anurag Gupta <agup006@gmail.com>
2015-08-05 08:17:51 +00:00
Martin Schygulla 82a7bf4e0d Merge branch 'master' into enhanced-vmwarefusion-driver 2015-08-04 13:40:38 +02:00
Nathan LeClaire af08468f00 Merge pull request #1640 from nathanleclaire/revert_ngb2d
Revert "Merge pull request #1552 from ehazlett/b2d-next"
2015-08-03 15:20:39 -07:00
Nathan LeClaire 8ba5a57072 Revert "Merge pull request #1552 from ehazlett/b2d-next"
This reverts commit 736ebb14fb, reversing
changes made to c6660bf62c.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-08-03 14:46:52 -07:00
Nathan LeClaire 633462d5b1 Merge pull request #1623 from dgageot/master
Doc for static IP and preemptibility
2015-08-03 11:50:26 -07:00
David Gageot 48f8d5b533
Doc for static IP and preemptibility
Signed-off-by: David Gageot <david@gageot.net>
2015-08-01 08:30:30 +02:00
Evan Hazlett 12f7ac57ae Merge pull request #1467 from dgageot/master
Support Static IPs and Preemptible instances on Google Compute Engine
2015-07-31 05:45:06 -07:00
Evan Hazlett 1469b3b704 Merge pull request #1612 from skatsuta/empty-dockerhost-active
libmachine: Filestore#GetActive() should return an error if DOCKER_HOST is empty
2015-07-31 05:15:08 -07:00
Evan Hazlett a51e4aaf5d Merge pull request #1620 from skatsuta/fix-hostname-test
libmachine: fix a test to check a host name is the same as expected
2015-07-31 05:05:58 -07:00
Soshi Katsuta 3f41f8ac4c libmachine: fix a test error message to show an expected host name
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-07-31 16:38:00 +09:00
Soshi Katsuta c8987830b9 libmachine: fix a test to check the host name is right
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-07-31 16:37:46 +09:00
Soshi Katsuta 47a890f27f libmachine: change an error message in Filestore#GetActive()
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-07-31 16:05:54 +09:00
Evan Hazlett 751e80eefd Merge pull request #1597 from nathanleclaire/ls_timeout
Add Timeout state to ls command
2015-07-30 17:54:28 -07:00
Nathan LeClaire e9c285cf6a Add Timeout state to ls command
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-30 13:44:40 -07:00
Soshi Katsuta aba294cbb1 libmachine: return an error if DOCKER_HOST is empty
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-07-30 19:50:08 +09:00
Evan Hazlett 7614212d4f Merge pull request #1564 from nathanleclaire/revert_migration
Revert configuration migration removal, include new version field, and introduce migration boilerplate
2015-07-29 16:50:49 -07:00
Evan Hazlett 3af29f3bef Merge pull request #1606 from hairyhenderson/verify-swarm-discovery-flag-1604
Verifying the --swarm-discovery flag
2015-07-29 11:52:12 -07:00
Evan Hazlett bf7eaf4b22 Merge pull request #1602 from nathanleclaire/skip_wonky_osrelease_lines
Skip and warn on wonky /etc/os-release lines
2015-07-29 11:51:53 -07: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
Nathan LeClaire 802393f253 Skip and warn on wonky /etc/os-release lines
If the lines don't split cleanly (occasionally STDERR gets mixed in, for
instance, due to our current SSH output setup), we should simply
log.Warn in the output instead of bailing completely.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-28 18:07:51 -07:00
Nathan LeClaire fb2e843e99 - Re-introduce config migration; fix panics occurring from older configs
- Introduce boilerplate for config.json migrations

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-28 15:38:16 -07:00
Evan Hazlett 4a8e93ac9b Merge pull request #1600 from czerasz/patch-1
Documentation typo update
2015-07-28 09:35:40 -07:00
Flavio Castelli 5de71f7e38 Add SUSE Enterprise Linux and openSUSE provision
Add support for SUSE Enterprise Linux and openSUSE

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-07-28 17:46:19 +02:00
Michał Czeraszkiewicz 8a02efe0c9 Documentation typo update 2015-07-28 15:21:38 +02:00
Nathan LeClaire ef9acc98b6 Merge pull request #1562 from jgeiger/patch-1
Update install-machine.md to reference 0.3.1
2015-07-27 11:19:32 -07:00
Joey Geiger 79b1af08e8 Remove specific version from link to binaries.
Signed-off-by: Joey Geiger <joey.geiger@irco.com>
2015-07-26 09:14:03 -06:00
Evan Hazlett 736ebb14fb Merge pull request #1552 from ehazlett/b2d-next
VirtualBox: Update to support new B2D
2015-07-24 18:20:42 -04:00
Evan Hazlett 0b03589187
fusion: use mkdir -p for home dir mount
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 17:34:07 -04:00
Evan Hazlett 65b5624221
proper check for hyper-v during upgrade
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 13:33:46 -04:00
Nathan LeClaire c6660bf62c Merge pull request #1581 from ehazlett/swarm-advertise
Use --advertise for Swarm join
2015-07-24 10:24:38 -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 5f972ad759
fusion: @tianon to the rescue <3; shared folders work again
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 12:31:36 -04:00
Evan Hazlett 7b5e887275 hyperv: update to b2d-ng and some extra <3
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 10:20:47 -04:00
Evan Hazlett 5af751ecf1
b2d: re-enable upgrade for local
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:38:01 -04:00
Evan Hazlett cb80c434ac b2d: use direct urls until release; devicemapper for engine opts tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

b2d-ng: use driver names for iso versions

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett 95c9b622dd fusion: update for b2d-ng
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett c6e9849783 vbox: restrict regex matching for msys translated paths
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove tar loading from virtual disk creation

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

tests: use btrfs instead of overlay for custom option test

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett e09f2fdd9c vbox: change to get latest released iso instead of pre-release
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: fix windows share dir for homedir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: update tests for b2d

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-24 09:07:01 -04:00
Evan Hazlett ab31d52165 update vbox driver to work with new b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: lock down shared folders to user home dir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use env var for user for cross platform

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove sudo from setting ssh key for user

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use homedir for share

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-23 19:40:07 -04:00
Joey Geiger 6aca2c9faf Update install-machine.md to reference 0.3.1
Update the docs to include links to newest release.

Signed-off-by: jgeiger <jgeiger@gmail.com>
2015-07-22 20:19:41 -06:00
Evan Hazlett ff8362848c Merge pull request #1543 from ehazlett/rpm-repos
use yum repos for redhat like distros
2015-07-22 21:34:29 -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
Evan Hazlett b43a76deec add GetOsReleaseInfo to provisioner to assist in testing; add tests for rpm repo
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 20:56:28 -04:00
Evan Hazlett 01bf2ea2d7 use yum repos for redhat like distros
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 20:56:27 -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
moxiegirl 1148a4590e Merge pull request #1563 from ehazlett/changelog
rename changelog
2015-07-22 15:11:48 -07:00
Nathan LeClaire 79b9450fef Revert "Remove flat (0.1.0) => nested (0.2.0) migration code"
This reverts commit 2f831887c6.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-07-22 11:22:33 -07:00
Evan Hazlett 9c3ec2e92a
rename changelog
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-07-22 13:35:41 -04:00
Nathan LeClaire ad6d8d49a8 Merge pull request #1497 from udryan10/engine-set-proxy-config
added {http,https,no} proxy support to docker engines
2015-07-21 17:25:16 -07:00
Evan Hazlett 89e6530528 Merge pull request #1501 from nathanleclaire/bail_on_failed_ssh
Bail on failed SSH command with information about what failed
2015-07-21 17:52:15 -04:00