Skip to content

Commit 501664b

Browse files
author
Quentin Perez
committed
Merge pull request #27 from scaleway/default-xenial
Switch default image to Ubuntu Xenial (16.04)
2 parents 64fed16 + ea6801c commit 501664b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Options:
5252
--engine-storage-driver Specify a storage driver to use with the engine
5353
--scaleway-commercial-type "VC1S" Specifies the commercial type [$SCALEWAY_COMMERCIAL_TYPE]
5454
--scaleway-debug Enables Scaleway client debugging [$SCALEWAY_DEBUG]
55-
--scaleway-image "ubuntu-trusty" Specifies the image [$SCALEWAY_IMAGE]
55+
--scaleway-image "ubuntu-xenial" Specifies the image [$SCALEWAY_IMAGE]
5656
--scaleway-name Assign a name [$SCALEWAY_NAME]
5757
--scaleway-organization Scaleway organization [$SCALEWAY_ORGANIZATION]
5858
--scaleway-token Scaleway token [$SCALEWAY_TOKEN]
@@ -124,7 +124,7 @@ $> curl --silent http://212.47.248.251 | head -n1 # you can also open your brows
124124
|``--scaleway-token`` or ``$SCALEWAY_TOKEN`` |Token UUID |none |yes |
125125
|``--scaleway-name`` or ``$SCALEWAY_NAME`` |Server name |none |no |
126126
|``--scaleway-commercial-type`` or ``$SCALEWAY_COMMERCIAL_TYPE`` |Commercial type |VC1S |no |
127-
|``--scaleway-image`` or ``$SCALEWAY_IMAGE`` |Server image |ubuntu-trusty |no |
127+
|``--scaleway-image`` or ``$SCALEWAY_IMAGE`` |Server image |ubuntu-xenial |no |
128128
|``--scaleway-debug`` or ``$SCALEWAY_DEBUG`` |Toggle debugging |false |no |
129129

130130
---
@@ -133,6 +133,7 @@ $> curl --silent http://212.47.248.251 | head -n1 # you can also open your brows
133133

134134
### master (unreleased)
135135

136+
* Switch default image to **Ubuntu Xenial**
136137
* Add `--scaleway-image` ([#22](https://github.com/scaleway/docker-machine-driver-scaleway/issues/22))
137138
* Add `--scaleway-debug`
138139

driver/scaleway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
const (
2323
// VERSION represents the semver version of the package
2424
VERSION = "v1.0.0+dev"
25-
defaultImage = "ubuntu-trusty"
25+
defaultImage = "ubuntu-xenial"
2626
defaultBootscript = "docker"
2727
)
2828

0 commit comments

Comments
 (0)