Tweak vagrant-scaleway configuration

Author: ignisf

Rakefile

@@ -71,9 +71,12 @@ namespace :build do
         sh "vagrant ssh -c 'git clone /libv8/.git ~/libv8 --recursive'"
         sh "vagrant ssh -c 'cd ~/libv8 && bundle install --path vendor/bundle'"
         sh "vagrant ssh -c 'cd ~/libv8 && env MAKEFLAGS=-j4 bundle exec rake binary'"
-        sh "vagrant ssh -c 'cp ~/libv8/pkg/*.gem /vagrant'"
-        sh("vagrant status | grep scaleway") do |ok, res|
-          sh "vagrant ssh --no-tty -c 'cd ~/libv8/pkg && tar -cf - *.gem' 2>/dev/null | tar -xv"
+        sh "vagrant status | grep scaleway" do |ok, res|
+          if ok
+            sh "vagrant ssh --no-tty -c 'cd ~/libv8/pkg && tar -cf - *.gem' 2>/dev/null | tar -xv"
+          else
+            sh "vagrant ssh -c 'cp ~/libv8/pkg/*.gem /vagrant'"
+          end
         end
         sh "vagrant destroy -f"
       end

release/aarch64-linux/.scaleway.sample

@@ -1,3 +1,3 @@
 ---
-organisation: 'foofoofo-foof-foof-foof-foofoofoofoo'
+organization: 'foofoofo-foof-foof-foof-foofoofoofoo'
 token: 'foofoofo-foof-foof-foof-foofoofoofoo'

release/aarch64-linux/Vagrantfile

@@ -3,7 +3,7 @@
 
 require 'yaml'
 
-SETTINGS = YAML.load_file(File.join(File.dirname(__FILE__), '.scaleway'))
+SETTINGS = YAML.load_file(File.join(Dir.home, '.scaleway'))
 
 # All Vagrant configuration is done below. The "2" in Vagrant.configure
 # configures the configuration version (we support older styles for
@@ -36,8 +36,9 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
+    apt-get purge -y unattended-upgrades
     apt-get install -y software-properties-common
-    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+    apt-get dist-upgrade -y
     apt-get install -y build-essential git ruby ruby-dev
     gem install bundler
     useradd -m -s /bin/bash vagrant

release/arm-linux/.scaleway.sample

@@ -1,3 +1,3 @@
 ---
-organisation: 'foofoofo-foof-foof-foof-foofoofoofoo'
+organization: 'foofoofo-foof-foof-foof-foofoofoofoo'
 token: 'foofoofo-foof-foof-foof-foofoofoofoo'

release/arm-linux/Vagrantfile

@@ -3,7 +3,7 @@
 
 require 'yaml'
 
-SETTINGS = YAML.load_file(File.join(File.dirname(__FILE__), '.scaleway'))
+SETTINGS = YAML.load_file(File.join(Dir.home, '.scaleway'))
 
 # All Vagrant configuration is done below. The "2" in Vagrant.configure
 # configures the configuration version (we support older styles for
@@ -37,7 +37,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
     apt-get install -y software-properties-common
-    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
+    apt-get dist-upgrade -y
     apt-get install -y build-essential git ruby ruby-dev
     gem install bundler
     useradd -m -s /bin/bash vagrant