Compare commits

...

6 Commits

Author SHA1 Message Date
Nathan LeClaire
41b3b25335 Bump version to 0.8.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:29:40 -07:00
Nathan LeClaire
81424e7b52 Move generated systemd unit file closer to upstream
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:11:54 -07:00
Ahmet Alp Balkan
f212b53d43 azure: update docs with updated default param
Update `--azure-image` param documented that changed in

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:47 -07:00
Ahmet Alp Balkan
3fe6f7f33c azure: increase log level for info statement
This should have been info in the first place.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:40 -07:00
Ahmet Alp Balkan
f63aaa20dd azure: bump default image to Ubuntu 16.04.0-LTS
Ubuntu 15.10 image is EOL'd and removed from azure.
Closes #3676.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:30 -07:00
Nathan LeClaire
b85aac1546 Bump version to 0.8.0
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-07-27 13:49:03 -07:00
5 changed files with 15 additions and 8 deletions

View File

@@ -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:15.10:latest` |
| `--azure-image` | `AZURE_IMAGE` | `canonical:UbuntuServer:16.04.0-LTS:latest` |
| `--azure-location` | `AZURE_LOCATION` | `westus` |
| `--azure-resource-group` | `AZURE_RESOURCE_GROUP` | `docker-machine` |
| `--azure-size` | `AZURE_SIZE` | `Standard_A2` |

View File

@@ -22,7 +22,7 @@ const (
defaultAzureLocation = "westus"
defaultSSHUser = "docker-user" // 'root' not allowed on Azure
defaultDockerPort = 2376
defaultAzureImage = "canonical:UbuntuServer:15.10:latest"
defaultAzureImage = "canonical:UbuntuServer:16.04.0-LTS:latest"
defaultAzureVNet = "docker-machine-vnet"
defaultAzureSubnet = "docker-machine"
defaultAzureSubnetPrefix = "192.168.0.0/16"

View File

@@ -192,7 +192,7 @@ func (a AzureClient) CreateVirtualNetworkIfNotExists(resourceGroup, name, locati
return nil
}
log.Debug("Creating virtual network.", f)
log.Info("Creating virtual network.", f)
_, err := a.virtualNetworksClient().CreateOrUpdate(resourceGroup, name,
network.VirtualNetwork{
Location: to.StringPtr(location),

View File

@@ -29,16 +29,23 @@ gpgkey=https://yum.dockerproject.org/gpg
`
engineConfigTemplate = `[Unit]
Description=Docker Application Container Engine
After=network.target docker.socket
Requires=docker.socket
After=network.target
[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=1048576
LimitNPROC=1048576
LimitNOFILE=infinity
LimitNPROC=infinity
LimitCORE=infinity
TimeoutStartSec=0
Delegate=yes
KillMode=process
Environment={{range .EngineOptions.Env}}{{ printf "%q" . }} {{end}}
[Install]
WantedBy=multi-user.target
`
majorVersionRE = regexp.MustCompile(`^(\d+)(\..*)?`)

View File

@@ -7,7 +7,7 @@ import (
var (
// Version should be updated by hand at each release
Version = "0.7.0"
Version = "0.8.1"
// GitCommit will be overwritten automatically by the build system
GitCommit = "HEAD"