Use machine_image resource to build docker images

instead of using machine resource.

Pinned chef-provisioning & chef-provisioning-docker versions.

Changes on php images:
  - Installs versions 5.5.34 & 7.0.5
  - Removed pear/pyrus extensions installations (no longer supported by
  php-build)
  - Set phpenv_build timeout to 7200
  - Set docker connection timeout to 10000

Changes on ruby images:
  - Removed versions 2.0.0 & 2.1.5 (keep 1.9.3-p547 & 2.1.5)
  - Set 2.1.5 as global version

Author: Antoine Rouyer

.chef/knife.rb

@@ -1,11 +1,14 @@
 # See http://docs.opscode.com/config_rb_knife.html
 # for more information on knife configuration options
 
+require 'chef/provisioning/docker_driver'
+driver 'docker'
+
 current_dir = File.dirname(__FILE__)
 
 log_level :info
 log_location STDOUT
 cache_type 'BasicFile'
 cache_options(path: "#{ENV['HOME']}/.chef/checksums")
 cookbook_path ["#{current_dir}/../cookbooks"]
-driver 'docker'
+role_path "#{current_dir}/../roles"

Berksfile

@@ -6,3 +6,4 @@ metadata
 cookbook 'docker'
 cookbook 'pyenv', git: 'https://github.com/sds/chef-pyenv.git'
 cookbook 'rbenv', git: 'https://github.com/RiotGames/rbenv-cookbook.git'
+cookbook 'phpenv', git: 'https://github.com/Numergy/phpenv-cookbook.git'

Gemfile

@@ -2,8 +2,8 @@
 source 'https://rubygems.org'
 
 gem 'chef', '~> 12'
-gem 'chef-provisioning'
-gem 'chef-provisioning-docker'
+gem 'chef-provisioning', '= 1.0.1'
+gem 'chef-provisioning-docker', '0.9.0'
 gem 'berkshelf'
 
 group :integration do

README.md

@@ -51,14 +51,13 @@ root@vagrant:~# bundle exec rake container:create
 ```
 $ docker images
 REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
-chef                ruby                f8290ef73660        7 minutes ago       722.4 MB
-...
+ci_ruby             latest              f8290ef73660        7 minutes ago       722.4 MB
 ```
 
 ###### Running our container:
 
 ```
-$ docker run -t -i --entrypoint "/bin/bash" chef:ruby --login -c "rbenv versions"
+$ docker run -t -i --entrypoint "/bin/bash" ci_ruby --login -c "rbenv versions"
 * 1.9.3-p547 (set by /opt/rbenv/version)
   2.0.0-p598
   2.1.0

Rakefile

@@ -52,24 +52,24 @@ end
 
 namespace :container  do
   current_dir = File.dirname(__FILE__)
-  containers = %w(java node_js php python ruby)
+  containers = %w(java nodejs php python ruby)
   containers.each do |name|
     task "create_#{name}".to_sym do
       run_command("chef-client -c #{current_dir}/.chef/knife.rb -z #{current_dir}/containers/#{name}.rb")
     end
 
     task "deploy_#{name}".to_sym, [:repository] do |_t, args|
-      repository = "#{args[:repository]}/" unless args[:repository].nil?
-      sh "docker tag -f $(docker images chef | grep #{name} | " \
-      "awk '{ print $3 }') #{repository}#{name}-builder"
-      sh "docker push #{repository}#{name}-builder"
+      repository = args[:repository] unless args[:repository].nil?
+      sh "docker tag $(docker images | grep ci_#{name} | " \
+         "awk '{ print $3 }') #{repository}/#{name}-builder"
+      sh "docker push #{repository}/#{name}-builder"
     end
   end
 
   multitask create: containers.map { |name, _recipe| "create_#{name}".to_sym }
 
   task :deploy, [:repository] do |_t, args|
-    repository = "#{args[:repository]}" unless args[:repository].nil?
+    repository = args[:repository] unless args[:repository].nil?
     containers.each do |name, _recipe|
       task "deploy_#{name}_m".to_sym do
         Rake::Task["container:deploy_#{name}".to_sym].invoke(repository)

attributes/phpenv.rb

@@ -16,10 +16,7 @@
 # limitations under the License.
 #
 
-default['container']['phpenv']['versions'] = ['5.3.29', '5.4.35', '5.5.19']
-default['container']['phpenv']['global'] = '5.3.29'
-default['container']['phpenv']['pear_extensions'] = ['pecl/mongo']
-default['container']['phpenv']['pyrus_extensions'] = ['pear/Archive_Tar-1.3.14',
-                                                      'pear/PEAR']
+default['container']['phpenv']['versions'] = ['5.5.34', '7.0.5']
+default['container']['phpenv']['global'] = '5.5.34'
 default['container']['phpenv']['ini_config'] =
   ["date.timezone = 'Europe/Paris'"]

attributes/rbenv.rb

@@ -17,11 +17,9 @@
 #
 
 node.default['container']['rbenv']['versions'] = ['1.9.3-p547',
-                                                  '2.0.0-p598',
-                                                  '2.1.0',
                                                   '2.1.5']
-node.default['container']['rbenv']['global'] = '1.9.3-p547'
+node.default['container']['rbenv']['global'] = '2.1.5'
 node.default['container']['rbenv']['packages'] = %w(bundler)
 
 default['container']['rbenv']['binaries_url'] = 'http://binaries.intercityup.com/ruby/ubuntu'
-default['container']['rbenv']['available_binaries'] = %w(2.1.0)
+default['container']['rbenv']['available_binaries'] = %w(2.1.5)

containers/java.rb

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-machine 'java' do
+
+machine_image 'ci_java' do
+  role 'java'
   machine_options docker_options: {
     base_image: {
       name: 'ubuntu',
       repository: 'ubuntu',
       tag: '14.04'
     }
   }
-  role 'java'
 end

containers/php.rb

@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
-machine 'php' do
+
+machine_image 'ci_php' do
+  role 'php'
   machine_options docker_options: {
     base_image: {
       name: 'ubuntu',
       repository: 'ubuntu',
       tag: '14.04'
     }
+  },
+  docker_connection: {
+    read_timeout: 10000
   }
-  role 'php'
 end

containers/python.rb

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-machine 'python' do
+
+machine_image 'ci_python' do
+  role 'python'
   machine_options docker_options: {
     base_image: {
       name: 'ubuntu',
       repository: 'ubuntu',
       tag: '14.04'
     }
   }
-  role 'python'
 end