docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,376 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

99 Commits

Author SHA1 Message Date
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
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 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
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
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
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
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
Evan Hazlett a6a6e16329
vbox: fix vbox race with unregistervm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-15 17:04:46 -04:00
Nathan LeClaire e91c28fad6 Check for IP to be assigned before returning from Start() 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-11 14:02:27 -07:00
Evan Hazlett 5a59fa8f12
added deprecation comment 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 16:24:49 -04:00
Evan Hazlett f26fb12664
vbox: fix panic with custom cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 14:04:48 -04:00
Evan Hazlett 2f4d8c4237 vbox: refactor random IP allocation to func 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett ca5f0738e2 vbox: allow specifying host only adapter cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett 3304bf8923 virtualbox: check for hostonly iface and add if needed on start 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett 98e38006c0 Merge pull request #1218 from ehazlett/vbox-intel-nic 
vbox: use intel driver for nic
 2015-05-26 11:04:19 -04:00
Evan Hazlett f82032b28d remove provider 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 10:41:03 -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 76ba5b258e
vbox: use intel driver for nic 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-19 09:26:24 -04:00
Evan Hazlett a3e08a010d Merge pull request #1108 from ibuildthecloud/vbox-sleep 
Fix issue where GetIP in VirtualBox failes due to no SSH
 2015-05-07 13:33:26 -07:00
Evan Hazlett 60be4c292c virtualbox: windows share support 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:31:43 -07:00
Darren Shepherd 8afe967a80 Fix issue where GetIP failes due to no SSH 
The main goal of this patch was to make the VirtualBox driver wait for
SSH before trying to get the IP of the VM.  The generic WaitForSSH
method required a Host struct as an arg.  This patch moves most of the
logic to the driver package so that drivers can call WaitForSSH.  The
existing functions in host are just wrappers to the real
implementation in drivers now.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-05 09:32:45 -07: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
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 6fe4331fdd
vbox: stop before rm for stability 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-30 10:36:59 -04:00
Evan Hazlett 03c1fbadc5 Merge pull request #1073 from ehazlett/vbox-use-single-core 
vbox: use single cpu by default
 2015-04-29 14:07:17 -04:00
Evan Hazlett 9e1185e06e
vbox: use dns pass through 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 12:33:10 -04:00
Evan Hazlett e8704b14f1
vbox: use single cpu by default 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:45:33 -04:00
John Fieber f42177983f Remove stray sleep() 
This is just a bit of development debris.

Signed-off-by: John Fieber <jrf@ursamaris.org>
 2015-04-27 16:58:57 -07:00
John Fieber cafad9bb1d Merge remote-tracking branch 'origin/master' into vboxnat 
# Conflicts:
#	drivers/virtualbox/virtualbox.go
 2015-04-27 10:01:43 -07:00
Evan Hazlett e9491d22dc b2d import: move debug logging to debug 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:03 -04:00
Evan Hazlett 33eab99e58 import cpu and memory settings when importing b2d vm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett a01322fa77 fixed ssh generation issue 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett 7a4e16e082 virtualbox: add ability to import b2d instances 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett 576951e03a wip: b2d import 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Simon Thulbourn 709b0a84e3 Add SSH client 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-04-21 15:37:09 +01:00
Vincent Bernat 44be16c49f drivers: don't let the driver wait for SSH/Docker 
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
John Fieber 6ab04a0b51 Extract a wrench accidentally left inside the engine 
Signed-off-by: John Fieber <jrf@ursamaris.org>
 2015-04-17 12:24:58 -07:00
John Fieber fdaa783597 Virtualbox: move NAT port allocation to machine boot 
The host side ssh NAT port was being chosen by the OS
when the VM was crafted in the `Create` method.
There was no accounting for some other process taking
over the port while the VM is shutoff.

This moves the port provisioning to VM start.
On first start, the OS will supply the port.  Subsequent
starts, we see if we can re-use the port, falling back
to delegating the selection to the OS.

Signed-off-by: John Fieber <jrf@ursamaris.org>
 2015-04-17 11:49:18 -07:00
Vincent Bernat 91d12d06ec drivers: remove unneeded `GetDockerConfigDir()` and `dockerConfigDir` const 
This method is not part of the driver interface anymore.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-10 17:03:11 +02:00
Evan Hazlett 45c8673f13 Merge pull request #920 from nathanleclaire/provisioner_upgrade 
Provisioner upgrade
 2015-03-31 12:12:51 -04:00
Evan Hazlett cfeffa530f Merge pull request #828 from ehazlett/vbox-tcp-port 
vbox: fix race with getting a tcp port
 2015-03-31 11:52:25 -04:00
Nathan LeClaire 9b5f395c60 Implement upgrade functionality for boot2docker 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-03-30 16:18:38 -07:00
Evan Hazlett f010a7bb80 Merge pull request #896 from ggiamarchi/dead_code 
Remove dead code
 2015-03-30 11:38:48 -04:00
Tom Barlow 97cd23f2e5 Added VIRTUALBOX_MEMORY_SIZE and VIRTUALBOX_DISK_SIZE env vars 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-03-28 23:07:48 +00:00
Guillaume Giamarchi fb1362ea05 Remove dead code 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-03-27 19:25:11 +01:00
Paul Biggar dde614dbb0 Adds virtualbox-cpu-count - fixes #819 
Signed-off-by: Paul Biggar <paul.biggar@gmail.com>
 2015-03-25 20:06:22 -07:00
Evan Hazlett f524029d48
virtualbox: add maximum retry for allocating a tcp port 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-03-25 18:10:54 -07:00