rbbt-image 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985e74d5183e70ec0ba00624edf6bf6a5fc32479
-  data.tar.gz: 9f983398ac5b35b6ea43d36dc7d1d8c734190235
+  metadata.gz: 7ed58604b057907a38851a6a92d7194f18053a7b
+  data.tar.gz: 2d388128b25ad6bab542ea78d4c5f2c2ddeed92e
 SHA512:
-  metadata.gz: 853f5b6d1221b2da5e48c4e553bfe69b96758df9d44c35ede7c642de519fe57e6b07995720ca2766fce4a34ebc21614168b4ba2dbb4b630f572637080efd55f2
-  data.tar.gz: 43f68462a65f1b1affea381f1cd569b69c4407ce2b8675b530c3429d55c0f05cf2ecf771020ad476c04f5d74e494348e23eb25e484ab4b8118531d0eb49b20c5
+  metadata.gz: 38d6594b2ecd3bca2b2072bcef5e5d6860445897a2893736410f6a57e1d499719052f836ab16b963ea6f793188ac60f8dcc906cccaaa48c5996aa703a2659e07
+  data.tar.gz: 57bb41af613cbb225121ec437802ac2408eeb3d6fe6087398db207c38a054ab95cb0547c5c64a4d8b7286824840a43c87e60784737fd03cd1f5389502c6d7482

data/Vagrantfile

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-build_script = File.join(File.basename(__FILE__), 'bin/build_rbbt_provision_sh')
+build_script = File.join(File.dirname(__FILE__), 'bin/build_rbbt_provision_sh.rb')
 provision_script = `ruby #{build_script}`
 
 VAGRANTFILE_API_VERSION = "2"
@@ -12,11 +12,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise32"
+  config.vm.box = "ubuntu/xenial64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+  #config.vm.box_url = "http://files.vagrantup.com/xenial.box"
 
   config.vm.network "forwarded_port", guest: 2887, host: 28879
 
@@ -53,18 +53,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   
   Vagrant.configure("2") do |config|
-        config.vm.provider "docker" do |d|
-            d.image = "ubuntu:14.04.2"
-        end
+   config.vm.provider "docker" do |d|
+    d.image = "ubuntu:xenial"
+   end
+
+   config.vm.provider :virtualbox do |vb|
+    # Don't boot with headless mode
+    vb.gui = true
+
+    # Use VBoxManage to customize the VM. For example to change memory:
+    vb.customize ["modifyvm", :id, "--memory", "4096"]
+   end
   end
   #
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
   #
   # View the documentation for the provider you're using for more
   # information on available options.
@@ -89,7 +90,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   # config.vm.provision :puppet do |puppet|
   #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "site.pp"
   # end
 
   # Enable provisioning with chef solo, specifying a cookbooks path, roles
@@ -132,5 +132,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 end
 
 Vagrant::Config.run do |config|
-  config.vm.customize ["modifyvm", :id, "--memory", 1024]
+ config.vm.customize ["modifyvm", :id, "--memory", 1024]
 end

data/bin/build_rbbt_provision_sh.rb

@@ -36,11 +36,12 @@ $ #{$0} [options]
 -c--concurrent Prepare system for high-concurrency
 -Rbv--ruby_version* Ruby version to use, using three numbers (defaults to 2.4.1)
 -op--optimize Optimize files under ~/.rbbt
+-dep--container_dependency* Use a different image in Dockerfile, Singularity and Virtualbox
 -dt--docker* Build docker image using the provided name
--df--docker_file* Use a Dockerfile different than the default
--dd--docker_dependency* Use a different image in the Dockerfile FROM
 -si--singularity* Build singularity image using the provided name
--v--volumnes* List of volumes to set-up
+-vb--virtualbox Build virtualbox image
+-df--docker_file* Use a Dockerfile different than the default
+-dv--docker_volumnes* List of volumes to set-up in Docker
 --nocolor Prevent rbbt from using colors and control sequences in the logs while provisioning
 --nobar Prevent rbbt from using progress bars while provisioning
 EOF
@@ -258,16 +259,16 @@ date
 
 EOF
 
-docker_dependency = options[:docker_dependency]
+container_dependency = options[:container_dependency] || 'ubuntu:xenial'
 
-if options[:docker]
+if docker_image = options[:docker]
   dockerfile = options[:dockerfile] || File.join(root_dir, 'Dockerfile')
   dockerfile_text = Open.read(dockerfile)
-  dockerfile_text.sub!(/^FROM.*/,'FROM ' + docker_dependency) if docker_dependency
+  dockerfile_text.sub!(/^FROM.*/,'FROM ' + container_dependency) if container_dependency
   dockerfile_text.sub!(/^USER rbbt/,'USER ' + USER) if USER != 'rbbt'
   dockerfile_text.sub!(/^ENV HOME \/home\/rbbt/,'ENV HOME /home/' + USER) if USER != 'rbbt'
-  if options[:volumnes]
-    volumnes = options[:volumnes].split(/\s*[,|]\s*/).collect{|d| "VOLUME " << d} * "\n"
+  if options[:docker_volumnes]
+    volumnes = options[:docker_volumnes].split(/\s*[,|]\s*/).collect{|d| "VOLUME " << d} * "\n"
     dockerfile_text.sub!(/^RUN/, volumnes + "\nRUN")
   end
   if options[:R_packages]
@@ -281,8 +282,8 @@ if options[:docker]
 
     puts "RUN"
     puts "==="
-    puts "docker build -t #{options[:docker]} '#{dir}'"
-    io = CMD.cmd("docker build -t #{options[:docker]} '#{dir}'", :pipe => true, :log => true)
+    puts "docker build -t #{docker_image} '#{dir}'"
+    io = CMD.cmd("docker build -t #{docker_image} '#{dir}'", :pipe => true, :log => true)
     while line = io.gets
       puts line
     end
@@ -292,7 +293,6 @@ else
 end
 
 if singularity_image = options[:singularity]
-  docker_dep = options[:docker_dependency] || 'ubuntu'
 
   TmpFile.with_file(nil, false) do |dir|
     Path.setup(dir)
@@ -301,7 +301,7 @@ if singularity_image = options[:singularity]
 
     bootstrap_text=<<-EOF
 Bootstrap: docker
-From: #{docker_dep}
+From: #{container_dependency}
 
 %post
   cat > /tmp/rbbt_provision.sh <<"EOS"
@@ -332,3 +332,39 @@ EOF
 
 end
 
+if options[:virtualbox]
+  TmpFile.with_file(nil, false) do |dir|
+    Path.setup(dir)
+
+    provision_file = dir['provision.sh']
+    vagrant_file = dir['Vagrantfile']
+
+    Open.write provision_file, provision_script
+    Open.write vagrant_file, <<-EOF
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.box = "#{container_dependency.sub(':','/')}64"
+
+  config.vm.provision :shell, :path => "#{provision_file}"
+  
+  config.vm.provider "virtualbox" do |vb|
+     # Display the VirtualBox GUI when booting the machine
+     vb.gui = true
+
+     # Customize the amount of memory on the VM:
+     vb.memory = "8192"
+  end
+end
+    EOF
+
+    iii dir
+    Misc.in_dir(dir) do
+      io = CMD.cmd('vagrant up', :pipe => true, :log => true)
+      while line = io.gets
+        puts line
+      end
+    end
+  end
+end

data/share/provision_scripts/R_setup.sh

@@ -7,10 +7,10 @@ cd /tmp
 
 apt-get remove r-base-core
 
-wget https://cran.r-project.org/src/base/R-3/R-3.3.2.tar.gz
-tar -xvzf R-3.3.2.tar.gz
+wget https://ftp.gwdg.de/pub/misc/cran/src/base/R-3/R-3.4.2.tar.gz -O R.tar.gz
+tar -xvzf R.tar.gz
 
-cd R-3.3.2/
+cd R-*/
 ./configure --prefix=/usr/local --enable-R-shlib
 make && make install
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-image
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util