diff --git a/docs/drivers/gce.md b/docs/drivers/gce.md index 258e1380975c3ebf2889b3f284c90e83fbc2069a..88a7c7b6dcfd4f2b1c51c9571b426004f3ae23ad 100644 --- a/docs/drivers/gce.md +++ b/docs/drivers/gce.md @@ -53,7 +53,7 @@ To create a machine instance, specify `--driver google`, the project id and the - `--google-use-internal-ip-only`: When this option is used during create, the new VM will not be assigned a public IP address. This is useful only when the host running `docker-machine` is located inside the Google Cloud infrastructure; otherwise, `docker-machine` can't reach the VM to provision the Docker daemon. The presence of this flag implies `--google-use-internal-ip`. - `--google-use-existing`: Don't create a new VM, use an existing one. This is useful when you'd like to provision Docker on a VM you created yourself, maybe because it uses create options not supported by this driver. -The GCE driver will use the `ubuntu-1510-wily-v20151114` instance image unless otherwise specified. To obtain a +The GCE driver will use the `ubuntu-2004-focal-v20240229` instance image unless otherwise specified. To obtain a list of image URLs run: gcloud compute images list --uri @@ -65,7 +65,7 @@ Environment variables and default values: | **`--google-project`** | `GOOGLE_PROJECT` | - | | `--google-zone` | `GOOGLE_ZONE` | `us-central1-a` | | `--google-machine-type` | `GOOGLE_MACHINE_TYPE` | `f1-standard-1` | -| `--google-machine-image` | `GOOGLE_MACHINE_IMAGE` | `ubuntu-1510-wily-v20151114` | +| `--google-machine-image` | `GOOGLE_MACHINE_IMAGE` | `ubuntu-2004-focal-v20240229` | | `--google-username` | `GOOGLE_USERNAME` | `docker-user` | | `--google-scopes` | `GOOGLE_SCOPES` | `devstorage.read_only,logging.write` | | `--google-disk-size` | `GOOGLE_DISK_SIZE` | `10` | diff --git a/drivers/google/google.go b/drivers/google/google.go index 6e94877a8d760a5f4a2bd34d31c5ea9bb3b9cf03..6fb0ee1b289f25faee49e8b46acd45c088dcb3e5 100644 --- a/drivers/google/google.go +++ b/drivers/google/google.go @@ -72,7 +72,7 @@ const ( defaultZone = "us-central1-a" defaultUser = "ubuntu" defaultMachineType = "n1-standard-1" - defaultImageName = "ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20210928" + defaultImageName = "ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20240229" defaultServiceAccount = "default" defaultScopes = "https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write" defaultDiskType = "pd-standard"