FIX #2023 and #1061 Use google default authentication

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot
2015-10-26 19:00:47 +01:00
parent a512b907cf
commit 77c2bbcdd2
178 changed files with 31887 additions and 189 deletions

View File

@@ -10,9 +10,12 @@ parent="smn_machine_drivers"
# Google Compute Engine
Create machines on [Google Compute Engine](https://cloud.google.com/compute/). You will need a Google account and project name. See https://cloud.google.com/compute/docs/projects for details on projects.
Create machines on [Google Compute Engine](https://cloud.google.com/compute/). You will need a Google account and project name.
See https://cloud.google.com/compute/docs/projects for details on projects.
The Google driver uses oAuth. When creating the machine, you will have your browser opened to authorize. Once authorized, paste the code given in the prompt to launch the instance.
The Google driver uses [Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials).
So if `docker-machine` is started from a GCE host, authentication will happen automatically.
Otherwise, you have to run `gcloud auth login` once before using `docker-machine`.
Options:
@@ -20,7 +23,6 @@ Options:
- `--google-machine-type`: The type of instance.
- `--google-username`: The username to use for the instance.
- `--google-project`: **required** The name of your project to use when launching the instance.
- `--google-auth-token`: Your oAuth token for the Google Cloud API.
- `--google-scopes`: The scopes for OAuth 2.0 to Access Google APIs. See [Google Compute Engine Doc](https://cloud.google.com/storage/docs/authentication).
- `--google-disk-size`: The disk size of instance.
- `--google-disk-type`: The disk type of instance.
@@ -28,17 +30,16 @@ Options:
- `--google-preemptible`: Instance preemptibility.
- `--google-tags`: Instance tags (comma-separated).
The GCE driver will use the `ubuntu-1404-trusty-v20150316` instance type unless otherwise specified.
The GCE driver will use the `ubuntu-1404-trusty-v20150909a` instance type unless otherwise specified.
Environment variables and default values:
| CLI option | Environment variable | Default |
|---------------------------|-----------------------|--------------------------------------|
| `--google-zone` | `GOOGLE_ZONE` | `us-central1-a` |
| `--google-machine-type` | `GOOGLE_MACHINE_TYPE` | `f1-micro` |
| `--google-machine-type` | `GOOGLE_MACHINE_TYPE` | `n1-standard-1` |
| `--google-username` | `GOOGLE_USERNAME` | `docker-user` |
| **`--google-project`** | `GOOGLE_PROJECT` | - |
| `--google-auth-token` | `GOOGLE_AUTH_TOKEN` | - |
| `--google-scopes` | `GOOGLE_SCOPES` | `devstorage.read_only,logging.write` |
| `--google-disk-size` | `GOOGLE_DISK_SIZE` | `10` |
| `--google-disk-type` | `GOOGLE_DISK_TYPE` | `pd-standard` |