added swap

.gitignore

@@ -1,2 +1,3 @@
 docker-machine-driver-vscale
-*.log
+*.log
+.idea/

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 (2016-06-02)
+
+Added SWAP
+
 ## 1.0.0 (2016-04-11)
 
 Initial public release

README.md

@@ -11,7 +11,7 @@ To install this plugin manually, download the binary `docker-machine-driver-vsca
 and  make it available by `$PATH`, for example by putting it to `/usr/local/bin/`:
 
 ```console
-$ curl -L https://github.com/vahaah/docker-machine-driver-vscale/releases/download/1.0.0/docker-machine-driver-vscale > /usr/local/bin/docker-machine-driver-vscale
+$ curl -L https://github.com/vahaah/docker-machine-driver-vscale/releases/download/1.0.1/docker-machine-driver-vscale > /usr/local/bin/docker-machine-driver-vscale
 
 $ chmod +x /usr/local/bin/docker-machine-driver-vscale
 ```
@@ -34,6 +34,7 @@ Available options:
  - `--vscale-location`: Server location.
  - `--vscale-rplan`: Server size.
  - `--vscale-made-from`: Server type
+ - `--vscale-swap-file`: Swap size in MB
 
 Environment variables and default values:
 
@@ -43,6 +44,7 @@ Environment variables and default values:
 | `--vscale-location`           | `VSCALE_LOCATION`           | `spb0`                      |
 | `--vscale-rplan`              | `VSCALE_RPLAN`              | `small`                     |
 | `--vscale-made-from`          | `VSCALE_MADE_FROM`          | `ubuntu_14.04_64_002_master`|
+| `--vscale-swap-file`          | `VSCALE_SWAP_FILE`          | `0`                         |
 
 ## Development
 

bin/main.go

@@ -31,7 +31,7 @@ func main() {
 	app.Name = path.Base(os.Args[0])
 	app.Usage = "This is a Docker Machine plugin binary. Please use it through the main 'docker-machine' binary."
 	app.Author = "Alex Vakhitov"
-	app.Email = "https://github.com/vahaah/docker-machine-vscale/"
+	app.Email = "https://github.com/vahaah/docker-machine-driver-vscale/"
 	app.Version = vscale.FullVersion()
 	app.Action = func(c *cli.Context) {
 		plugin.RegisterDriver(vscale.NewDriver("", ""))

version.go

@@ -6,7 +6,7 @@ import "fmt"
 var GitCommit string
 
 // Version number that is being run at the moment.
-const Version = "1.0.0"
+const Version = "1.0.1"
 
 // FullVersion formats the version to be printed.
 func FullVersion() string {

vscale.go

@@ -23,12 +23,14 @@ type Driver struct {
 	MadeFrom    string
 	Location    string
 	SSHKeyID    int
+	SwapFile    int
 }
 
 const (
 	defaultRplan    = "small"
 	defaultLocation = "spb0"
 	defaultMadeFrom = "ubuntu_14.04_64_002_master"
+	defaultSwapFile = 0
 )
 
 func (d *Driver) GetCreateFlags() []mcnflag.Flag {
@@ -56,6 +58,12 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Vscale made from",
 			Value:  defaultMadeFrom,
 		},
+		mcnflag.IntFlag{
+			EnvVar: "VSCALE_SWAP_FILE",
+			Name:   "vscale-swap-file",
+			Usage:  "Vscale swap file",
+			Value:  defaultSwapFile,
+		},
 	}
 }
 
@@ -64,6 +72,7 @@ func NewDriver(hostName, storePath string) *Driver {
 		Rplan:    defaultRplan,
 		Location: defaultLocation,
 		MadeFrom: defaultMadeFrom,
+		SwapFile: defaultSwapFile,
 		BaseDriver: &drivers.BaseDriver{
 			MachineName: hostName,
 			StorePath:   storePath,
@@ -108,6 +117,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.Location = flags.String("vscale-location")
 	d.Rplan = flags.String("vscale-rplan")
 	d.MadeFrom = flags.String("vscale-made-from")
+	d.SwapFile = flags.Int("vscale-swap-file")
 
 	d.SwarmMaster = flags.Bool("swarm-master")
 	d.SwarmHost = flags.String("swarm-host")
@@ -180,7 +190,20 @@ func (d *Driver) Create() error {
 		time.Sleep(1 * time.Second)
 	}
 
-	log.Debugf("Created scalet with ID: %v, IPAddress: %v", d.ScaletID, d.IPAddress)
+	log.Info(fmt.Sprintf("Created scalet with ID: %v, IPAddress: %v", d.ScaletID, d.IPAddress))
+	if d.SwapFile > 0 {
+		log.Info(fmt.Sprintf("Creating SWAP file %d MB", d.SwapFile))
+
+		_, err := drivers.RunSSHCommandFromDriver(d, fmt.Sprintf(`touch /var/swap.img && \
+		chmod 600 /var/swap.img && \
+		dd if=/dev/zero of=/var/swap.img bs=1MB count=%d && \
+		mkswap /var/swap.img && swapon /var/swap.img && \
+		echo '/var/swap.img    none    swap    sw    0    0' >> /etc/fstab`, d.SwapFile))
+
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }