Compare commits
1 Commits
v0.8.2
...
v0.8.0-rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ca1b85719 |
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.7.1
|
||||
FROM golang:1.6.2
|
||||
|
||||
RUN go get github.com/golang/lint/golint \
|
||||
github.com/mattn/goveralls \
|
||||
|
||||
@@ -105,7 +105,7 @@ Environment variables and default values:
|
||||
|
||||
## Default AMIs
|
||||
|
||||
By default, the Amazon EC2 driver will use a daily image of Ubuntu 15.10.
|
||||
By default, the Amazon EC2 driver will use a daily image of Ubuntu 15.10 LTS.
|
||||
|
||||
| Region | AMI ID |
|
||||
| -------------- | ------------ |
|
||||
|
||||
@@ -81,7 +81,7 @@ Environment variables and default values:
|
||||
| ------------------------------- | ----------------------------- | ------------------ |
|
||||
| **`--azure-subscription-id`** | `AZURE_SUBSCRIPTION_ID` | - |
|
||||
| `--azure-environment` | `AZURE_ENVIRONMENT` | `AzurePublicCloud` |
|
||||
| `--azure-image` | `AZURE_IMAGE` | `canonical:UbuntuServer:16.04.0-LTS:latest` |
|
||||
| `--azure-image` | `AZURE_IMAGE` | `canonical:UbuntuServer:15.10:latest` |
|
||||
| `--azure-location` | `AZURE_LOCATION` | `westus` |
|
||||
| `--azure-resource-group` | `AZURE_RESOURCE_GROUP` | `docker-machine` |
|
||||
| `--azure-size` | `AZURE_SIZE` | `Standard_A2` |
|
||||
|
||||
@@ -22,7 +22,7 @@ const (
|
||||
defaultAzureLocation = "westus"
|
||||
defaultSSHUser = "docker-user" // 'root' not allowed on Azure
|
||||
defaultDockerPort = 2376
|
||||
defaultAzureImage = "canonical:UbuntuServer:16.04.0-LTS:latest"
|
||||
defaultAzureImage = "canonical:UbuntuServer:15.10:latest"
|
||||
defaultAzureVNet = "docker-machine-vnet"
|
||||
defaultAzureSubnet = "docker-machine"
|
||||
defaultAzureSubnetPrefix = "192.168.0.0/16"
|
||||
|
||||
@@ -192,7 +192,7 @@ func (a AzureClient) CreateVirtualNetworkIfNotExists(resourceGroup, name, locati
|
||||
return nil
|
||||
}
|
||||
|
||||
log.Info("Creating virtual network.", f)
|
||||
log.Debug("Creating virtual network.", f)
|
||||
_, err := a.virtualNetworksClient().CreateOrUpdate(resourceGroup, name,
|
||||
network.VirtualNetwork{
|
||||
Location: to.StringPtr(location),
|
||||
|
||||
@@ -93,7 +93,7 @@ func saveTenantID(path string, tenantID string) error {
|
||||
return fmt.Errorf("Failed to create directory %s: %v", dir, err)
|
||||
}
|
||||
|
||||
f, err := ioutil.TempFile(dir, "tenantid")
|
||||
f, err := ioutil.TempFile(os.TempDir(), "tenantid")
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to create temp file: %v", err)
|
||||
}
|
||||
@@ -107,7 +107,7 @@ func saveTenantID(path string, tenantID string) error {
|
||||
|
||||
// atomic move by rename
|
||||
if err := os.Rename(fp, path); err != nil {
|
||||
return fmt.Errorf("Failed to rename file. src=%s dst=%s error=%v", fp, path, err)
|
||||
return fmt.Errorf("Failed to rename file: %v", err)
|
||||
}
|
||||
if err := os.Chmod(path, perm); err != nil {
|
||||
return fmt.Errorf("Failed to chmod the file %s: %v", path, err)
|
||||
|
||||
@@ -35,7 +35,7 @@ type Driver struct {
|
||||
const (
|
||||
defaultSSHPort = 22
|
||||
defaultSSHUser = "root"
|
||||
defaultImage = "ubuntu-16-04-x64"
|
||||
defaultImage = "ubuntu-15-10-x64"
|
||||
defaultRegion = "nyc3"
|
||||
defaultSize = "512mb"
|
||||
)
|
||||
|
||||
@@ -91,7 +91,7 @@ func findVBoxInstallDirInRegistry() (string, error) {
|
||||
}
|
||||
|
||||
func getShareDriveAndName() (string, string) {
|
||||
return "c/Users", "\\\\?\\c:\\Users"
|
||||
return "c/Users", "c:\\Users"
|
||||
}
|
||||
|
||||
func isHyperVInstalled() bool {
|
||||
|
||||
@@ -29,23 +29,16 @@ gpgkey=https://yum.dockerproject.org/gpg
|
||||
`
|
||||
engineConfigTemplate = `[Unit]
|
||||
Description=Docker Application Container Engine
|
||||
After=network.target
|
||||
After=network.target docker.socket
|
||||
Requires=docker.socket
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecStart=/usr/bin/docker daemon -H tcp://0.0.0.0:{{.DockerPort}} -H unix:///var/run/docker.sock --storage-driver {{.EngineOptions.StorageDriver}} --tlsverify --tlscacert {{.AuthOptions.CaCertRemotePath}} --tlscert {{.AuthOptions.ServerCertRemotePath}} --tlskey {{.AuthOptions.ServerKeyRemotePath}} {{ range .EngineOptions.Labels }}--label {{.}} {{ end }}{{ range .EngineOptions.InsecureRegistry }}--insecure-registry {{.}} {{ end }}{{ range .EngineOptions.RegistryMirror }}--registry-mirror {{.}} {{ end }}{{ range .EngineOptions.ArbitraryFlags }}--{{.}} {{ end }}
|
||||
ExecReload=/bin/kill -s HUP $MAINPID
|
||||
MountFlags=slave
|
||||
LimitNOFILE=infinity
|
||||
LimitNPROC=infinity
|
||||
LimitNOFILE=1048576
|
||||
LimitNPROC=1048576
|
||||
LimitCORE=infinity
|
||||
TimeoutStartSec=0
|
||||
Delegate=yes
|
||||
KillMode=process
|
||||
Environment={{range .EngineOptions.Env}}{{ printf "%q" . }} {{end}}
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
`
|
||||
|
||||
majorVersionRE = regexp.MustCompile(`^(\d+)(\..*)?`)
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
var (
|
||||
// Version should be updated by hand at each release
|
||||
Version = "0.8.2"
|
||||
Version = "0.8.0-rc2"
|
||||
|
||||
// GitCommit will be overwritten automatically by the build system
|
||||
GitCommit = "HEAD"
|
||||
|
||||
Reference in New Issue
Block a user