af149d13f7
Fix defaulting to native SSH
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-16 10:51:25 -07:00
6d26992101
Merge pull request #1347 from ehazlett/fix-vbox-panic
...
vbox: fix panic with custom cidr
2015-06-11 14:02:04 -07:00
5a59fa8f12
added deprecation comment
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 16:24:49 -04:00
f26fb12664
vbox: fix panic with custom cidr
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-11 14:04:48 -04:00
effa03dad4
Merge pull request #1343 from moxiegirl/1329-migrate-b2b
...
Closes #1329 when merged
2015-06-11 10:09:53 -04:00
9840c4bfe2
Merge pull request #1320 from TrumanLing/update-doc-for-availability-zone
...
Update documentation for adding parameter --openstacke-availability-zone
2015-06-11 10:05:29 -04:00
d8d673bf24
Closes #1329 when merged
...
Updating links
Updating with the comments from the team
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-10 16:09:30 -07:00
061f865c3e
Merge pull request #1341 from ehazlett/windows-prompt-for-env
...
windows: error message if using powershell/cmd and none specified
2015-06-10 13:49:21 -07:00
d8418d01d2
Merge pull request #1338 from amylindburg/master
...
Update ROADMAP.md
2015-06-09 13:32:19 -04:00
823020837c
Merge pull request #1119 from huslage/ca-more-capabilities
...
Generate more generic certificates that can have other uses.
2015-06-09 13:20:14 -04:00
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
ee8ec4b7aa
Merge pull request #1314 from moxiegirl/tweak-1288
...
Tweaking the language to the 1288 work. Thanks everyone.
2015-06-09 09:53:15 -07:00
3387f988b8
Merge pull request #1292 from ehazlett/vbox-recreate-hostonlyif
...
virtualbox: more flexibility with networking
2015-06-09 09:35:08 -07:00
2f4d8c4237
vbox: refactor random IP allocation to func
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
ca5f0738e2
vbox: allow specifying host only adapter cidr
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-09 11:05:29 -04:00
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
43f377b0b7
Update ROADMAP.md
...
Add Project Planning section to ROADMAP.md
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
2015-06-08 14:14:13 -07:00
a86a99648d
Update documentation for adding parameter --openstacke-availability-zone
...
Signed-off-by: Ling Fake <lingfake@huawei.com>
2015-06-06 07:02:16 -07:00
914d1c04b0
Tweaking the language to the 1288 work
...
DigitalOcean is one word
Entering comments and killing nits
Fixing the OSX wagon
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-05 18:57:31 -07:00
7925bf2683
Merge pull request #1316 from TrumanLing/add_support_availability_zone
...
Add option parameter availability_zone for openstack
2015-06-05 17:45:16 -07:00
c1b9ef6743
Add option parameter availability_zone
...
Signed-off-by: Ling FaKe <lingfake@huawei.com>
2015-06-05 17:37:43 -07:00
30c2086cdf
Merge pull request #1304 from nathanleclaire/integration_continues
...
Add some helpers and patch ups to the integration tests
2015-06-05 11:07:44 -04:00
f6a6a1f8c8
Merge pull request #1222 from zchee/update-amazonec2-ami
...
Update AMI to release 20150603
2015-06-05 10:30:57 -04:00
d1d4625d99
Merge pull request #1288 from ehazlett/base-os-docs
...
docs: more info about supported base operating systems
2015-06-05 09:52:12 -04:00
e75b6a5e5f
Add some helpers and patch ups to the integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-04 15:41:37 -07:00
7c669e2c4c
Merge pull request #1307 from ehazlett/maintainers
...
add nathan to maintainers
2015-06-04 17:44:21 -04:00
f2e6a89970
add nathan to maintainers
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-04 17:43:48 -04:00
0dc1cc0ff3
Update AMI to release 20150603
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-06-05 05:33:06 +09:00
7190a5c226
docs: add note about changing ssh user for provider image
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
docs: fixed suggestions from nathan
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-04 16:07:56 -04:00
b7fa6456bf
docs: more info about supported base operating systems; removed change log from docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-04 16:07:56 -04:00
d8419af0b2
Merge pull request #1255 from exoscale/fix/exoscale-wait-vm
...
exoscale: ensure we sleep a bit while waiting for the VM to be ready
2015-06-04 14:56:32 -04:00
7397d15e60
Merge pull request #1295 from exoscale/fix/bats-invoking-docker-machine
...
test: don't invoke docker-machine directly
2015-06-04 14:01:30 -04:00
6d075aed02
test: don't invoke docker-machine directly
...
Use `machine` helper for that.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 10:30:34 +02:00
3c16a870ac
exoscale: move job waiting into a separate function
...
Waiting for a job to complete is split into a dedicated function,
outside of `waitForVM()`. Functions only waiting for the job to complete
will use this new function instead. The "job is done" testing logic is
also casted into a separate function.
The original `waitForVM()` function is now waiting for the job to
complete, then retrieve the VM. This introduces an extra API call which
could be avoided by having a `waitForJob()` return the last response but
this makes the code simpler for other users and adding a special variant
just for that seems to be overkill.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:33:17 +02:00
2d25f56ff7
exoscale: use the new `utils.WaitForSpecificOrError` function to wait for job to finish
...
Instead of using a custom loop, use the newly introduced
`utils.WaitForSpecificOrError` function. Beware that on success, we use
the successful response to get the VM object (outside the loop).
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
2a60a4ea32
exoscale: ensure we sleep a bit while waiting for the VM to be ready
...
Otherwise, the timeout is reached far too soon: instead of waiting for
the VM for two minutes, we wait only for a couple of seconds.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-03 09:09:07 +02:00
4a54559233
Merge pull request #1280 from ehazlett/native-ssh-fix
...
fix issue with native ssh; fix tty allocation for redhat
2015-06-02 16:48:02 -04:00
c268b263a3
Merge pull request #1158 from nathanleclaire/integration_cleanup
...
Refactor integration tests
2015-06-02 14:46:44 -04:00
ed01843dc9
Refactor integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-06-02 10:10:52 -07:00
a879b39902
Merge pull request #1268 from janeczku/waitforssh
...
Check that instance has started before polling SSH
2015-06-02 10:31:01 -04:00
89fdcbc094
Merge pull request #1270 from ggiamarchi/doc-openstack-typo
...
Fix typo in OpenStack driver documentation
2015-06-02 10:24:52 -04:00
5e958d0914
Merge pull request #1286 from exoscale/fix/exoscale-swarm-firewall
...
exoscale: add the appropriate port to make Swarm work
2015-06-02 09:13:27 -04:00
a6c58534ca
exoscale: add the appropriate port to make Swarm work
...
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-06-02 11:44:18 +02:00
e0aca821cf
Merge pull request #1282 from ehazlett/engine-swarm-provision-env-vars
...
enable overrides for engine and swarm install
2015-06-01 20:32:32 -04:00
cf0aee9fd7
support specifying swarm image and docker versions
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-01 16:20:56 -04:00
0b5a389481
fix issue with native ssh; fix tty allocation for redhat
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-06-01 10:08:07 -04:00
3cd44ec4ef
Merge pull request #1277 from ggiamarchi/openstack/bug#1269
...
Openstack / Stop polling the instance when status is ERROR
2015-06-01 08:40:59 -04:00
de817cfe46
Stop polling the instance when status is ERROR
...
Fix #1269
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-06-01 00:49:23 +02:00
2b9dd68542
Handle possible error in WaitForSpecific func
...
In some situations we need to be aware of errors
to basically return it rather than polling again
and angain until the timeout.
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-06-01 00:49:16 +02:00
eb5729d9e1
Merge pull request #1276 from hairyhenderson/amazonec2-spot-instance-monitoring-fix
...
Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
2015-05-30 23:02:21 -04:00
Nathan LeClaire
Nathan LeClaire
Evan Hazlett
Mary Anthony
Amy Lindburg
LingFaKe
Koichi Shiraishi
Vincent Bernat
Guillaume Giamarchi