Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update GCE and Rackspace default image to Ubuntu 16.04

Browse Source 
Signed-off-by: Tao Wang <twang2218@gmail.com>
This commit is contained in:
Tao Wang
2016-11-25 03:18:54 +11:00
parent 8c97379cf0
commit c0e800cca1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/google/google.go
View File

@@ -36,7 +36,7 @@ const (
defaultZone = "us-central1-a"
defaultUser = "docker-user"
defaultMachineType = "n1-standard-1"
defaultImageName = "ubuntu-os-cloud/global/images/ubuntu-1510-wily-v20160627"
defaultImageName = "ubuntu-os-cloud/global/images/ubuntu-1604-xenial-v20161130"
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"
defaultDiskSize = 10

6
drivers/rackspace/rackspace.go
View File

@@ -57,7 +57,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
mcnflag.StringFlag{
EnvVar: "OS_IMAGE_ID",
Name: "rackspace-image-id",
Usage: "Rackspace image ID. Default: Ubuntu 15.10 (Wily Werewolf) (PVHVM)",
Usage: "Rackspace image ID. Default: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
},
mcnflag.StringFlag{
EnvVar: "OS_FLAVOR_ID",
@@ -144,10 +144,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}
if d.ImageId == "" {
// Default to the Ubuntu 15.10 image.
// Default to the Ubuntu 16.04 image.
// This is done here, rather than in the option registration, to keep the default value
// from making "machine create --help" ugly.
d.ImageId = "59a3fadd-93e7-4674-886a-64883e17115f"
d.ImageId = "821ba5f4-712d-4ec8-9c65-a3fa4bc500f9"
}
if d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL" {