docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
1,221 Commits 92 Branches 28 Tags
c1b9ef6743fd2f32af1bb2beafdb2289db744678
Commit Graph

1221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LingFaKe
c1b9ef6743 Add option parameter availability_zone 
Signed-off-by: Ling FaKe <lingfake@huawei.com>
 2015-06-05 17:37:43 -07:00
Evan Hazlett
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
Evan Hazlett
f6a6a1f8c8 Merge pull request #1222 from zchee/update-amazonec2-ami 
Update AMI to release 20150603
 2015-06-05 10:30:57 -04:00
Evan Hazlett
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
Nathan LeClaire
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
Evan Hazlett
7c669e2c4c Merge pull request #1307 from ehazlett/maintainers 
add nathan to maintainers
 2015-06-04 17:44:21 -04:00
Evan Hazlett
f2e6a89970 add nathan to maintainers 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-04 17:43:48 -04:00
Koichi Shiraishi
0dc1cc0ff3 Update AMI to release 20150603 
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
 2015-06-05 05:33:06 +09:00
Evan Hazlett
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
Evan Hazlett
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
Evan Hazlett
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
Evan Hazlett
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
Vincent Bernat
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
Vincent Bernat
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
Vincent Bernat
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
Vincent Bernat
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
Evan Hazlett
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
Evan Hazlett
c268b263a3 Merge pull request #1158 from nathanleclaire/integration_cleanup 
Refactor integration tests
 2015-06-02 14:46:44 -04:00
Nathan LeClaire
ed01843dc9 Refactor integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-02 10:10:52 -07:00
Evan Hazlett
a879b39902 Merge pull request #1268 from janeczku/waitforssh 
Check that instance has started before polling SSH
 2015-06-02 10:31:01 -04:00
Evan Hazlett
89fdcbc094 Merge pull request #1270 from ggiamarchi/doc-openstack-typo 
Fix typo in OpenStack driver documentation
 2015-06-02 10:24:52 -04:00
Evan Hazlett
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
Vincent Bernat
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
Evan Hazlett
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
Evan Hazlett
cf0aee9fd7 support specifying swarm image and docker versions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-01 16:20:56 -04:00
Evan Hazlett
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
Evan Hazlett
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
Guillaume Giamarchi
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
Guillaume Giamarchi
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
Evan Hazlett
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
Dave Henderson
904acb914a Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-05-30 22:25:36 -04:00
Guillaume Giamarchi
f251fe9736 Fix typo in OpenStack driver documentation 
Add missing dashes before options

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-05-29 21:35:48 +02:00
Jan Broer
c7e9dc7849 libmachine: wait for instance start before polling SSH 
Signed-off-by: Jan Broer <janeczku@yahoo.de>
 2015-05-29 16:54:06 +02:00
Evan Hazlett
cef1686b33 Merge pull request #1257 from ehazlett/redhat-latest-rpm 
redhat: use engine version 1.7rc1
 2015-05-28 16:52:49 -04:00
Evan Hazlett
67bc2d685c Merge pull request #1259 from exoscale/fix/exoscale-doc 
exoscale: Two small documentation fixes
 2015-05-28 14:16:22 -04:00
Vincent Bernat
704e5fce41 exoscale/doc: specifying URL endpoint is not mandatory 
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 16:34:54 +02:00
Vincent Bernat
b414f00210 exoscale/doc: remove ability to choose a keypair 
Due to commit b772e66394, it is not
possible to use a custom keypair. Remove mention of it from the
documentation.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 16:33:30 +02:00
Evan Hazlett
139eb2824c Merge pull request #1258 from exoscale/fix/egoscale-32bit 
exoscale: update egoscale binding for 32-bit compatibility
 2015-05-28 09:30:14 -04:00
Vincent Bernat
9fb227b3b2 exoscale: update egoscale binding for 32-bit compatibility 
egoscale is updated to use int64 where it makes sense.

Closes #1212.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 15:02:34 +02:00
Evan Hazlett
584dec8a74 redhat: use engine version 1.7rc1 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-28 08:51:42 -04:00
Evan Hazlett
fec8b4aaab Merge pull request #1252 from janeczku/docs-fix 
docs: fix merge conflict in docs (replaces #1248)
 2015-05-27 16:03:11 -04:00
Jan Broer
8cdf8e9561 Fixed corrupted docs 
Signed-off-by: Jan Broer <janeczku@yahoo.de>
 2015-05-27 21:03:59 +02:00
Evan Hazlett
be7c110dfd Merge pull request #1247 from ehazlett/redhat-tty-fix 
redhat: fix tty provision bug
 2015-05-27 13:57:44 -04:00
Evan Hazlett
ae5aeb2a67 Merge pull request #1246 from alexwlchan/master 
Fix spelling and capitalisation mistakes in docs
 2015-05-27 11:44:01 -04:00
Evan Hazlett
512f403bb2 Merge pull request #1244 from frapposelli/vcloudair-fix-catalogitem 
Fix for the default vCloud Air catalog item.
 2015-05-27 11:42:18 -04:00
Evan Hazlett
a66c229cda Merge pull request #1178 from ehazlett/debian-provisioner 
Debian Provisioner
 2015-05-27 10:59:19 -04:00
Evan Hazlett
ec5edb0354 redhat: fix tty provision bug 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-27 10:56:43 -04:00
Evan Hazlett
d99a46ca04 Merge pull request #1217 from janeczku/logger-bugfix 
logger: fix error logger writing to stdout instead of stderr
 2015-05-27 10:28:54 -04:00
alex.chan@metaswitch.com
566528547e Fix spelling and capitalisation mistakes in docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-05-27 15:16:07 +01:00
Evan Hazlett
e8cdc30549 Merge pull request #1215 from janeczku/driver-exoscale 
exoscale: fix driver hanging on failed VM operation
 2015-05-27 10:04:15 -04:00