fix: update with vagrant files and tdd

Author: bcleonard

.gitignore

@@ -0,0 +1 @@
+.vagrant

.rspec

@@ -1,3 +1,3 @@
 --require spec_helper
---format documentation
 --color
+--format documentation

Dockerfile

@@ -1,21 +1,27 @@
-FROM fedora:25
-MAINTAINER Bradley Leonard <[email protected]> 
+FROM debian:jessie
+LABEL MAINTAINER Bradley Leonard <[email protected]>
+LABEL description="This container will run the boinc-client."
 
 # install boinc
-RUN dnf -y install compat-libstdc++-296.i686 compat-libstdc++-33.i686 boinc-client\
-  && dnf clean all
+RUN apt-get update &&                           \
+    apt-get -q install -y boinc-client &&       \
+    apt-get clean &&                            \
+    rm -rf /var/lib/apt/lists/*
+
 
 EXPOSE 31416
 
 WORKDIR /var/lib/boinc
 
-#USER boinc
+USER boinc
+
+ENTRYPOINT ["boinc"]
 
 # create directories
-RUN mkdir /scripts
+#RUN mkdir /scripts
 
 # add the startup.sh
-ADD startup.sh /scripts/startup.sh
-RUN chmod 755 /scripts/startup.sh
+#ADD startup.sh /scripts/startup.sh
+#RUN chmod 755 /scripts/startup.sh
 
-CMD ["/scripts/startup.sh"]
+#CMD ["/scripts/startup.sh"]

Vagrantfile

@@ -0,0 +1,135 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Check for missing plugins
+required_plugins = %w( vagrant-vbguest )
+plugin_installed = false
+required_plugins.each do |plugin|
+  unless Vagrant.has_plugin?(plugin)
+    system "vagrant plugin install #{plugin}"
+    plugin_installed = true
+  end
+end
+
+# If new plugins installed, restart Vagrant process
+if plugin_installed === true
+  exec "vagrant #{ARGV.join' '}"
+end
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "fedora/25-cloud-base"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # we will try to autodetect this path.
+  # However, if we cannot or you have a special one you may pass it like:
+  # config.vbguest.iso_path = "#{ENV['HOME']}/Downloads/VBoxGuestAdditions.iso"
+  # or an URL:
+  # config.vbguest.iso_path = "http://company.server/VirtualBox/%{version}/VBoxGuestAdditions.iso"
+  # or relative to the Vagrantfile:
+  # config.vbguest.iso_path = File.expand_path("../relative/path/to/VBoxGuestAdditions.iso", __FILE__)
+
+  # set auto_update to false, if you do NOT want to check the correct
+  # additions version when booting this machine
+  config.vbguest.auto_update = true
+
+  # do NOT download the iso file from a webserver
+  config.vbguest.no_remote = true
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+  config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  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 = "1024"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+  config.vm.provision "shell", inline:  <<-OSPREREQ
+    echo "installing os pre reqs:"
+    dnf install -y unix2dos dos2unix
+  OSPREREQ
+  config.vm.provision "shell", inline:  <<-SHELL
+    echo "installing ruby & prereq for installing gems:"
+    dnf install -y ruby ruby-devel redhat-rpm-config zlib-devel patch
+    echo "installing ruby gems:"
+    gem install bundler
+    gem install dockerspec
+    echo "installing docker:"
+    dnf -y install dnf-plugins-core
+    dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+    dnf makecache fast
+    dnf -y install docker-ce
+    usermod -aG docker vagrant
+    systemctl enable docker
+    systemctl start docker
+  SHELL
+  config.vm.provision "shell", inline:  <<-DOCKERRAIC
+    echo "installing docker_raic:"A
+    if [ ! -f /usr/local/bin/docker_raic ]
+    then
+      cp /vagrant/bin/docker_raic /usr/local/bin/docker_raic
+      chmod 755 /usr/local/bin/docker_raic
+    fi
+  DOCKERRAIC
+end

bin/docker_raic

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Delete all containers
+docker rm $(docker ps -a -q)
+
+# Delete all images
+docker rmi $(docker images -q)
+

spec/Dockerfile_spec.rb

@@ -1,39 +1,55 @@
-require "serverspec"
-require "docker"
-require "spec_helper"
-require "os_spec"
+require "dockerspec/serverspec"
 
 Docker.options[:read_timeout] = 900
 BOINC_PORT = 31416
 
 describe "Dockerfile" do
-  before(:all) do
-    @image = Docker::Image.build_from_dir('.', {'networkmode' => 'host'})
 
-    set :os, family: :fedora
-    set :backend, :docker
-    set :docker_image, @image.id
-  end
+  describe docker_build(path: '.', tag: 'boinc') do
+    it { should have_label 'MAINTAINER' => 'Bradley Leonard <[email protected]>' }
+    it { should have_label 'description' => 'This container will run the boinc-client.' }
+    it { should have_expose '31416' }
+    it { should have_user 'boinc' }
+    it { should have_workdir '/var/lib/boinc' }
+    it { should have_entrypoint 'boinc'}
 
-  it "installs the right version of fedora" do
-    expect(os_version).to include("Fedora release 25")
+    describe docker_run('boinc', family: :debian) do
+      describe 'boinc-client' do
+        describe package('boinc-client') do
+          it { should be_installed }
+        end
+      end
+    end
   end
+end
+#  before(:all) do
+#    @image = Docker::Image.build_from_dir('.', {'networkmode' => 'host'})
+#
+#    set :os, family: :fedora
+#    set :backend, :docker
+#    set :docker_image, @image.id
+#  end
 
-  describe package("boinc-client") do
-    it { should be_installed.with_version('7.6.22') }
-  end
 
-  describe file('/scripts/startup.sh') do
-    it { should be_mode 755 }
-  end
+#  it "installs the right version of fedora" do
+#    expect(os_version).to include("Fedora release 25")
+#  end
+
+#  describe package("boinc-client") do
+#    it { should be_installed.with_version('7.6.22') }
+#  end
 
-  describe 'Dockerfile#config' do
+#  describe file('/scripts/startup.sh') do
+#    it { should be_mode 755 }
+#  end
 
-    it 'should expose the boinc management port' do
-       expect(@image.json['ContainerConfig']['ExposedPorts']).to include("#{BOINC_PORT}/tcp")
-    end
+#  describe 'Dockerfile#config' do
 
-  end
+#    it 'should expose the boinc management port' do
+#       expect(@image.json['ContainerConfig']['ExposedPorts']).to include("#{BOINC_PORT}/tcp")
+#    end
+#
+#  end
 
 
 #  possible tests for Dockerfile
@@ -89,4 +105,4 @@
 #
 #  end
 
-end
+#end

test.sh

@@ -5,3 +5,4 @@ echo "Executing tests:"
 echo ""
 rspec spec/Dockerfile_spec.rb
 echo ""
+