Travis Thieman
b57c4c203f
Determine host-only interface dynamically, stop assuming eth1
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2016-02-25 12:02:26 -05:00
Nathan LeClaire
8046e13683
Merge pull request #1553 from jasisk/fix-conffile-error
...
Fix apt-get error on conf file conflict
2016-02-23 19:22:07 -08:00
Jean-Charles Sisk
b1999a7820
fix apt-get error on conf file conflict
...
Signed-off-by: Jean-Charles Sisk <jasisk@gmail.com>
2016-02-23 21:30:04 -05:00
Nathan LeClaire
0acadcb35f
Merge pull request #3091 from ozlerhakan/doc
...
update command line references
2016-02-22 14:38:22 -08:00
Hakan Ozler
d7e97d0443
update command line references
...
Signed-off-by: Hakan Ozler <hakan.ozler@kodcu.com>
2016-02-20 18:53:33 +02:00
Nathan LeClaire
7cc7fbadcc
Merge pull request #3090 from mishak87/patch-1
...
Typo docker-machine -f is shortcut for --format
2016-02-19 16:52:47 -08:00
Michal Gebauer
a1aeae46ec
Fixed rouge paren
...
Signed-off-by: Michal Gebauer <mishak@mishak.net>
2016-02-20 00:30:20 +01:00
Jean-Laurent de Morlhon
568e1b6a6e
Merge pull request #3088 from jmelis/master
...
Add OpenNebula Driver Plugin
2016-02-19 15:32:34 +01:00
Michal Gebauer
b9302b3043
Typo docker-machine -f is shortcut for --format
...
Signed-off-by: Michal Gebauer <mishak@mishak.net>
2016-02-19 15:25:55 +01:00
Jaime Melis
71bf6ed6cf
Add OpenNebula Driver Plugin
...
Signed-off-by: Jaime Melis <jmelis@opennebula.org>
2016-02-19 13:05:12 +01:00
Jean-Laurent de Morlhon
e28bfc55e0
Merge pull request #3017 from hypriot/set-longmode-on
...
Add option --longmode on to support Windows 32bit hosts
2016-02-19 09:36:17 +01:00
Stefan Scherer
c40f9f7a21
Add option --longmode on to support Windows 32bit hosts
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-19 08:51:24 +01:00
Jean-Laurent de Morlhon
2a95370032
Merge pull request #3085 from dgageot/improve-doc-generic
...
Improve Generic driver doc
2016-02-19 08:32:29 +01:00
David Gageot
742c87ee3f
Improve Generic driver doc
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-19 07:25:31 +01:00
Nathan LeClaire
0c9adcb01e
Merge pull request #3082 from patrikerdes/3015_active_timeout_error_message
...
Fix #3015
2016-02-18 11:31:39 -08:00
David Gageot
7070fe863b
Merge pull request #3075 from synfinatic/adt-enable-fusion-timesync
...
Enable syncing time for VMWare Fusion guests
2016-02-18 17:57:18 +01:00
David Gageot
20ec62b05f
Merge pull request #3081 from thaJeztah/no-more-lxc
...
docs: remove reference to lxc-docker
2016-02-18 17:57:07 +01:00
Patrik Erdes
e7c58ea7ae
Fix #3015
...
Signed-off-by: Patrik Erdes <patrik@erdes.se>
2016-02-18 12:28:22 +01:00
Sebastiaan van Stijn
1331811dca
docs: remove reference to lxc-docker
...
The package on apt.dockerproject.org is now called
'docker-engine'.
Also replaced 'dev' with 'default', because that's
the default name for machines.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-18 12:20:26 +01:00
Jean-Laurent de Morlhon
cf7885163c
Merge pull request #2932 from sipicsg/master
...
added hyperv static mac address and vlan option for machine creation
2016-02-18 09:56:34 +01:00
Jean-Laurent de Morlhon
bf12d191e3
Merge pull request #3018 from hypriot/improve-no-vtx-check
...
Improve --virtualbox-no-vtx-check option to allow starting the VM
2016-02-18 09:54:54 +01:00
Jean-Laurent de Morlhon
95644775c4
Merge pull request #3053 from dgageot/3052-go-1.6rc2
...
Use golang 1.6
2016-02-18 09:53:05 +01:00
David Gageot
27e572113f
FIX #3051 Use golang 1.6
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-18 08:51:30 +01:00
David Gageot
5918c13d22
Merge pull request #3067 from dgageot/3056-ls-timeout
...
FIX #3056 ls timeout when instance is stopped
2016-02-18 08:41:43 +01:00
Nathan LeClaire
7ec902189d
Merge pull request #3069 from dgageot/3068-dns-proxy-mode
...
VirtualBox: use dns proxy mode
2016-02-17 13:35:55 -08:00
Nathan LeClaire
7c6316d146
Merge pull request #3073 from miqui/master
...
add my name to driver contributor list
2016-02-17 12:02:10 -08:00
Nathan LeClaire
256b711344
Merge pull request #3072 from jloisel/patch-1
...
Fix: missing AMI for ap-northeast-2
2016-02-17 12:01:25 -08:00
Nathan LeClaire
16440a89f9
Merge pull request #3074 from kojiromike/patch-1
...
Specify correct name for virtio net nic device
2016-02-17 12:01:07 -08:00
Aaron Turner
e790d9f47a
Enable syncing time for VMWare Fusion guests
...
By default, VMWare Fusion does not sync the guest OS's time to the host
and when running Fusion+docker-machine on a laptop the guest clock will
drift and not resync which can create a variety of problems (such as
authentication issues with AWS, etc)
Signed-off-by: Aaron Turner <synfinatic@gmail.com>
2016-02-17 09:46:39 -08:00
David Gageot
ffb9cbed7a
FIX #3056 ls timeout when instance is stopped
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-17 18:09:39 +01:00
Michael A. Smith
736ce7b6ab
Specify correct name for virtio net nic device
...
With VirtualBox 5.0.14r105127, 'virtio-net' is not a valid name for the option. The correct option appears to be 'virtio'.
Signed-off-by: Michael A. Smith <michaels@syapse.com>
2016-02-17 11:28:05 -05:00
Miguel Quintero
3ca3a4bf21
add my name
...
Signed-off-by: Miguel Quintero <miguel.quintero@hpe.com>
2016-02-17 11:15:55 -05:00
Jerome Loisel
c0d03b928e
Fix: missing AMI for ap-northeast-2
...
Ubuntu Server 14.04 LTS (HVM), EBS General Purpose (SSD) Volume Type. Support available from Canonical (http://www.ubuntu.com/cloud/services ).
Signed-off-by: jloisel <jerome.loisel@grinstone.com>
2016-02-17 16:55:58 +01:00
Jean-Laurent de Morlhon
dc5f1e9bdb
Merge pull request #3066 from dgageot/3065-improve-vtx-check
...
FIX #3065 Improve VT-X check
2016-02-17 16:43:43 +01:00
David Gageot
3e6c3c05ce
FIX #3068 DNS Proxy mode
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-17 15:02:27 +01:00
David Gageot
4c9879dcd5
FIX #3065 Improve VT-X check
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-17 13:46:05 +01:00
Jean-Laurent de Morlhon
1eaf5a464f
Merge pull request #3020 from mssola/swarm-experimental
...
Added a flag to enable experimental Swarm features
2016-02-13 14:10:44 -08:00
Miquel Sabaté Solà
7e201c4005
Added a flag to enable experimental Swarm features
...
The `create` command now has the `--swarm-experimental` boolean flag, that
tells the Swarm provisioner to enable experimental features in Swarm.
Fixes #2861
Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
2016-02-13 12:21:20 +01:00
Nathan LeClaire
a517ef0c42
Merge pull request #3054 from londoncalling/carry-pr-3047
...
Start local machines on startup (fixes #2857 )
2016-02-12 17:36:22 -08:00
Caio Fernando Bertoldi Paes de Andrade
7e7c6b5ee4
Start local machines on startup ( fixes #2857 )
...
Signed-off-by: Caio Fernando Bertoldi Paes de Andrade <caiofbpa@icloud.com>
Carries and closes #3047
modified per Nathan's comments, missed it first time round
modified wording per Seb's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-12 17:31:58 -08:00
David Gageot
87a659efb3
Merge pull request #3042 from dgageot/3016-add-timeout-to-active-command
...
Add timeout to active command
2016-02-11 14:15:18 -08:00
David Gageot
7a6ca308c4
FIX #3016 Add timeout to active command
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:55:52 -08:00
David Gageot
5178043d02
Merge pull request #3041 from dgageot/3040-fix-slow-test
...
FIX #3040 Slow test
2016-02-11 13:55:04 -08:00
David Gageot
8345672b18
FIX #3040 Slow test
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:31:36 -08:00
Olivier Gambier
4262a8fde5
Merge pull request #3034 from davemkirk/3025-registry-env-var
...
Add ENGINE_REGISTRY_MIRROR env var support.
2016-02-11 11:05:34 -08:00
David Gageot
eae3a747b7
Merge pull request #3038 from jeanlaurent/doc-lint-ref
...
Markdown linting in docs/reference directory
2016-02-11 09:52:03 -08:00
Jean-Laurent de Morlhon
f6cb147f0d
Markdown linting in docs/reference directory
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-02-11 09:29:52 -08:00
Jean-Laurent de Morlhon
ebed0f14ae
Merge pull request #3035 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-10 23:37:05 -08:00
Mary Anthony
785e183466
Updating Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:52:47 -08:00
David Kirk
090c575c0d
Add env var support.
...
Signed-off-by: David Kirk <davemkirk@gmail.com>
2016-02-10 21:25:28 -06:00