docker-builder 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d881511665b52826f0f8e369a352bac25d63b06c
-  data.tar.gz: ddbb779ff4ea383842c19af5bced4f8c7ad5cbb7
+  metadata.gz: 64818dcd8a002f703ad3e8815a65b41f41b982fa
+  data.tar.gz: b5fc7a84041278996604d286c6391e0d26ae83b5
 SHA512:
-  metadata.gz: 8ae3492ddd49936ce1bd1e2344d4f1a4858caabd5265a068e5352dbfc6681faac2162adaee6be19394a861e7f18dc67d01584306003748d5aa40f105baffe5d2
-  data.tar.gz: 41136426282739c7726d7aa103f8e7b527a3fe97c08b26209e4ba6030fd30dc5c04507b2aa13fb6a875ef870dca9eda69f31d70a5fbc37489287d171ab74ea6a
+  metadata.gz: 797b8478d848233a699374827abe591cc8674a43fed256abd4f9e4e32c3b5946e3cbba4ba56308a199a1d791d69c157c9ab8c731a04ccc36a6837a71565ad4ca
+  data.tar.gz: c16f17c1625468db57cd685e16bd567d3ec2da81f7fb55422141ad4a7766a8b2475fc965c5789662adffbe47260a3fd4655db3a22b9e8ff70c0185e0bfb8628e

data/examples/example-apps-php/temp/apps-php.1.json

@@ -0,0 +1,14 @@
+{"name":"apps-php",
+"build":{"image_name":
+"apps-php","build_type":"chef","base_image":{"name":"my-nginx-php","repository":"my-nginx-php","tag":"latest"}},
+
+"install":{
+"host":{"script_type":"chef_recipe","script":"install_host"},
+"node":{"script_type":"chef_recipe","script":"install"}},
+"docker":{"command":"/sbin/my_init","ports":[[8080,80]],
+"volumes":[["/disk3/data/my-examples/apps-php/html","/var/www/html"],
+["/disk3/data/my-examples/apps-php/log/nginx","/var/log/nginx/"]],
+"links":[]},
+"attributes":{"nginx":{"sitename":"mysite.local"},"apps":{"app1":{"app_name":"app1","app_env":"production","app_domain":"app1.mmx.gex","app_domain_aliases":["app1.mmx.local"]},"app2":{"app_name":"app2","app_env":"production","app_domain":"app2.mmx.gex","app_domain_aliases":["app2.mmx.local"]}}},
+"common":{"prefix":"example-","image_prefix":"example-","dir_data":"/disk3/data/my-examples/"},
+"base":{"image_name":"example-apps-php","container_name":"example-apps-php"}}

data/examples/example-base-chef/.chef/knife.rb

@@ -0,0 +1,6 @@
+puts "cookbooks from server: #{cookbook_path}"
+
+cookbook_path cookbook_path+[
+    '/work/chef-repo/cookbooks-common',
+    '/work/chef-repo/cookbooks',
+]

data/examples/example-base-chef/config.rb

@@ -0,0 +1,19 @@
+common({
+    'prefix' => "example-",
+    'image_prefix' => 'example-',
+    'dir_data' => '/disk3/data/my-exampless/example-base-chef',
+
+})
+
+servers({
+
+    'my'=>{
+        # some server options here
+    }
+
+})
+
+
+base({
+
+})

data/examples/example-base-chef/readme.md

@@ -0,0 +1,8 @@
+
+# Build
+
+* build base image first from https://github.com/maxivak/docker-image-phusion-base
+
+```
+docker build -t my-base-phusion-1604 github.com/maxivak/docker-image-phusion-base.git
+```

data/examples/example-base-chef/servers/my/.chef/knife.rb

@@ -0,0 +1,2 @@
+####
+

data/examples/example-base-chef/servers/my/config.rb

@@ -0,0 +1,53 @@
+
+add 'build', {
+    "image_name" => "my5",
+    'build_type' => 'chef',
+
+    "base_image" => {
+        "name" => "my-base-phusion-1604",
+        "repository" => "my-base-phusion-1604",
+        "tag" => "latest"
+
+    },
+
+}
+
+add 'install', {
+    "host" => {
+        'script_type' => 'chef_recipe',
+        'script' => 'install_host',
+    },
+    "node" => {
+        'script_type' => 'chef_recipe',
+        'script' => 'install',
+    }
+
+
+}
+
+
+add 'docker', {
+    'command' => "/sbin/my_init",
+    #"command"=> "",
+    'ports' => [
+        #[8080,80],
+    ],
+    'volumes' => [
+        #['html', '/var/www/html'],
+        #['log/nginx', '/var/log/nginx/'],
+    ],
+    'links' => [
+    ]
+}
+
+
+
+add 'attributes', {
+  'nginx' =>{
+      "sitename" =>"mysite.local"
+  },
+
+
+}
+
+

data/examples/example-base-chef/servers/my/cookbooks/my/README.md

@@ -0,0 +1 @@
+#  nginx

data/examples/example-base-chef/servers/my/cookbooks/my/metadata.rb

@@ -0,0 +1,9 @@
+name             'my'
+maintainer       'YOUR_COMPANY_NAME'
+maintainer_email 'YOUR_EMAIL'
+license          'All rights reserved'
+description      'Base image'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '0.1.0'
+
+#depends "apt"

data/examples/example-base-chef/servers/my/cookbooks/my/recipes/build.rb

@@ -0,0 +1,13 @@
+# will be added to Docker image
+
+#
+=begin
+['/var/www/html', 'var/www/temp'].each do |d|
+  directory d do
+    recursive true
+    action :create
+  end
+
+end
+
+=end

data/examples/example-base-chef/servers/my/cookbooks/my/recipes/install_host.rb

@@ -0,0 +1,9 @@
+# will be run on the host machine
+
+file '/tmp/example-base-intalled.txt' do
+  content '22'
+end
+
+
+
+

data/examples/example-base-chef/temp/my.json

@@ -0,0 +1 @@
+{"name":"my","build":{"image_name":"my5","build_type":"chef","base_image":{"name":"my-base-phusion-1604","repository":"my-base-phusion-1604","tag":"latest"}},"install":{"host":{"script_type":"chef_recipe","script":"install_host"},"node":{"script_type":"chef_recipe","script":"install"}},"docker":{"command":"/sbin/my_init","ports":[],"volumes":[],"links":[]},"attributes":{"nginx":{"sitename":"mysite.local"}},"common":{"prefix":"example-","image_prefix":"example-","dir_data":"/disk3/data/my-exampless/example-base-chef"},"base":{"image_name":"example-my5","container_name":"example-my"}}

data/lib/docker_builder/chef/.chef/knife.rb

@@ -21,16 +21,17 @@ node_name     my_server_name
 knife[:chef_node_name] = my_server_name
 
 server_base_dir = ENV['SERVER_PATH']
-server_cookbooks_path = File.expand_path('cookbooks', server_base_dir)
-
 
 #client_key               "#{current_dir}/dummy.pem"
 #validation_client_name   "validator"
 
+### cookbooks
+
+server_cookbooks_path = File.expand_path('cookbooks', server_base_dir)
+
 cookbooks_paths = [
     server_cookbooks_path,
 
-    #'/mnt/data/projects/mmx/docker-builder/examples/example-nginx/servers/nginx/cookbooks',
     #File.expand_path('../temp-cookbooks', root),
     #File.join(root, '../cookbooks'),
     #File.join(root, '../', node_name, 'cookbooks'),
@@ -44,7 +45,7 @@ cookbooks_paths = [
 
 cookbooks_paths.reject!{|f| !Dir.exists?(f)}
 
-#puts "cookbooks: #{cookbooks_paths.inspect}"
+puts "cookbooks: #{cookbooks_paths.inspect}"
 
 
 
@@ -66,7 +67,7 @@ end
 
 cookbook_path cookbook_path+cookbooks_paths
 
-puts "FINAL cookbooks: #{cookbook_path}"
+#puts "FINAL cookbooks: #{cookbook_path}"
 
 # node name
 knife[:force] = true

data/lib/docker_builder/chef/chef_build_image.rb

@@ -7,33 +7,28 @@ require 'chef/provisioning'
 
 #
 server_name = ENV['SERVER_NAME']
-#puts "server: #{server_name}"
-#puts "node: #{node['docker'].inspect}"
-#exit
-
 
 # settings
 docker_options = {
     base_image: node['build']['base_image'],
-    #base_image: 'nginx:1.10',
     privileged: true,
     command: node['docker']['command'] || '',
-    #command: "nginx -g 'daemon off;'",
-    #command: "",
-
 }
 
-#puts "image = #{settings.image_name}"
-#puts "opt = #{docker_options}"
+#puts "server: #{server_name}"
+#puts "node base = #{node['base']}"
+#puts "image = #{node['base']['image_name']}"
+#puts "node attr: #{node['attributes']}"
+#puts "docker opt = #{docker_options}"
 #exit
 
-
-
-
+image_name = node['base']['image_name']
+#image_name = 'example-my'
 
 ### docker image
 with_driver 'docker'
-machine_image node['base']['image_name'] do
+#machine_image node['base']['image_name'] do
+machine_image image_name do
   action :create
 
   #tag '0.1'

data/lib/docker_builder/chef/chef_build_image_debug1.rb

@@ -0,0 +1,60 @@
+base_dir = File.dirname(__FILE__)
+
+#
+require 'chef/provisioning'
+
+#
+server_name = ENV['SERVER_NAME']
+puts "server: #{server_name}"
+puts "node base: #{node['base']}"
+puts "node docker: #{node['docker'].inspect}"
+puts "attr: #{node['attributes']}"
+puts "image: #{node['base']['image_name']}"
+
+#exit
+
+
+
+# settings
+docker_options = {
+    base_image: 'my-base-phusion-1604',
+    privileged: true,
+    command: '/sbin/my_init',
+
+}
+
+#puts "image = #{settings.image_name}"
+puts "docker opt = #{docker_options}"
+#exit
+
+
+
+
+
+### docker image
+with_driver 'docker'
+machine_image 'example-my2' do
+  action :create
+
+  #tag '0.1'
+
+  recipe "#{server_name}::build"
+
+  # attributes
+  #node.keys.each do |k|
+  #  attribute k, node[k]
+  #end
+
+  # attributes
+  #node['attributes'].keys.each do |k|
+  #  attribute k, node['attributes'][k]
+  #end
+
+  #
+  machine_options docker_options: docker_options
+
+
+end
+
+
+

data/lib/docker_builder/chef/chef_destroy_image.rb

@@ -8,18 +8,6 @@ server_name = ENV['SERVER_NAME']
 
 
 # settings
-docker_options = {
-    base_image: node['build']['base_image'],
-    privileged: true,
-    command: node['docker']['command'] || '',
-    #ports: settings.docker_ports_array,
-    #volumes: settings.docker_volumes_array,
-    #links: settings.docker_links_array
-}
-
-#puts "image = #{settings.image_name}"
-#puts "opt = #{docker_options}"
-
 
 ### docker image
 with_driver 'docker'

data/lib/docker_builder/cli.rb

@@ -37,10 +37,10 @@ class CLI < Thor
                 :desc     => 'Path to your config.rb file.'
 
   def build
-    puts "building..."
+    puts "building images..."
 
     opts = options
-    puts "opt from command line: #{options.inspect}"
+    #puts "opt from command line: #{options.inspect}"
 
 
     warnings = false
@@ -130,21 +130,17 @@ class CLI < Thor
     warnings = false
     errors = false
 
+    servers = nil
+
     begin
       Config.load(options)
-      puts "config: #{Config.inspect}"
 
       Config.servers.each do |name, opts|
         server_settings = Settings.load_settings_for_server(name)
 
-        puts "s: #{server_settings.inspect}"
-        exit
-
         Manager.destroy_image(name, server_settings)
       end
 
-      #raise Error, "No servers found " + "'#{ triggers.join(',') }'." if models.empty?
-
     rescue Exception => err
       puts "exception: #{err.inspect}"
       raise err

data/lib/docker_builder/config.rb

@@ -126,7 +126,7 @@ module DockerBuilder
 
         new_root = root_path.empty? ? false : set_root_path(root_path)
 
-        puts "FINAL root= #{@root_path}"
+        #puts "FINAL root= #{@root_path}"
         #exit
 
         DEFAULTS.each do |name, ending|

data/lib/docker_builder/cookbooks/docker-builder/README.md

@@ -0,0 +1 @@
+# Docker builder

data/lib/docker_builder/cookbooks/docker-builder/libraries/docker_containers_lib.rb

@@ -0,0 +1,11 @@
+
+
+class DockerContainersLib
+  def self.debug
+    puts "hello"
+
+  end
+
+
+
+end

data/lib/docker_builder/cookbooks/docker-builder/libraries/myhelpers.rb

@@ -0,0 +1,14 @@
+class Chef
+  class Recipe
+
+    # A shortcut
+    def get_attr_data(name)
+      node[name]
+    end
+
+    def get_attr_data_docker(name)
+      node[name][:docker]
+    end
+
+  end
+end

data/lib/docker_builder/cookbooks/docker-builder/libraries/resource_mycontainer.rb

@@ -0,0 +1,33 @@
+=begin
+def destroy_container(name)
+  return @r unless @r.nil?
+
+  @r = Chef::Resource::Machine.new(name, run_context)
+  @r.action(:destroy)
+
+  @r
+end
+=end
+
+require 'chef/resource'
+
+class Chef
+  class Resource
+    # Missing top-level class documentation comment
+    class MyDockerContainer < Chef::Resource
+      def initialize(name, run_context = nil)
+        super
+        @resource_name = :my_docker_container
+        #@provider = Chef::Provider::RunitService
+        #@supports = { restart: true, reload: true, status: true }
+        #@action = :create
+        #@allowed_actions = [:nothing, :start, :stop, :enable, :disable, :restart, :reload, :status, :once, :hup, :cont, :term, :kill, :up, :down, :usr1, :usr2, :create]
+
+
+
+      end
+    end
+  end
+end
+
+

data/lib/docker_builder/cookbooks/docker-builder/metadata.rb

@@ -0,0 +1,9 @@
+name             'docker-builder'
+maintainer       'YOUR_COMPANY_NAME'
+maintainer_email 'YOUR_EMAIL'
+license          'All rights reserved'
+description      'Docker builder'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '0.1.0'
+
+

data/lib/docker_builder/cookbooks/docker-builder/recipes/install_container.rb

@@ -0,0 +1,18 @@
+base_dir = File.dirname(__FILE__)
+
+#
+require_relative 'lib/settings'
+
+#
+server_name = ENV['SERVER_NAME']
+settings = Settings.load_settings_for_server(server_name)
+
+#
+file '/home/mmx/temp/1.txt' do
+  content '<html>This is a placeholder for the home page.</html>'
+end
+
+
+#include "#{settings.name}::install"
+#include "phpredisadmin-php-fpm::install"
+include_recipe "phpredisadmin-php-fpm::install"

data/lib/docker_builder/cookbooks/docker-builder/recipes/provision_container.rb

@@ -0,0 +1,14 @@
+base_dir = File.dirname(__FILE__)
+
+#
+require_relative 'lib/settings'
+
+#
+require 'chef/provisioning'
+
+#
+server_name = ENV['SERVER_NAME']
+settings = Settings.load_settings_for_server(server_name)
+
+#
+#include "#{settings.name}::install"

data/lib/docker_builder/cookbooks/docker-builder/resources/mycontainer.rb

@@ -0,0 +1,65 @@
+#resource_name :mycontainer
+
+property :container_name, String, default: ''
+property :data, Hash, default: {}
+property :app_data_dir, String, default: ''
+
+#property :docker_options, Hash, default: {}
+
+action :stop do
+  execute 'docker s' do
+    command "docker stop #{container_name}"
+
+    ignore_failure true
+  end
+
+end
+
+action :destroy do
+
+  machine container_name do
+    action :destroy
+  end
+
+end
+
+
+action :create do
+  docker_volumes = data['docker']['volumes'] || []
+  docker_ports = data['docker']['ports'] || []
+
+  # create directories for volumes
+  docker_volumes.each do |d|
+    directory "#{app_data_dir}#{d}" do
+      mode '0775'
+      recursive true
+      action :create
+    end
+  end
+
+  # run container
+  machine container_name do
+    tag '0.1'
+
+    action :create
+
+    recipe recipe_provision
+
+    #chef_environment chef_env
+
+    # attributes
+    data['attributes'].keys.each do |k|
+      attribute k, data['attributes'][k]
+    end
+
+
+    machine_options docker_options: {
+        base_image: {name: data['docker']['base_image'], repository: data['docker']['base_image'], tag: data['docker']['base_image_tag']  },
+        command: data['docker']['command'] || '',
+        privileged: true,
+        ports: docker_ports,
+        volumes: docker_volumes.map{|d| "#{app_data_dir}#{d}:#{d}"}
+    }
+
+  end
+end

data/lib/docker_builder/manager.rb

@@ -220,6 +220,8 @@ class Manager
 
 
   def self.destroy_image(server_name, settings={})
+    puts "destroying image for server #{server_name}"
+
     cmd %Q(docker rmi #{settings.image_name} )
     cmd %Q(docker rm -f chef.converge.#{settings.image_name} )
 

data/lib/docker_builder/server_settings.rb

@@ -74,6 +74,11 @@ class ServerSettings
       return "#{bi['name']}:#{bi['tag']}"
     end
 
+    #
+    if attributes['build']['image_name']
+      return "#{attributes['common']['image_prefix']}#{attributes['build']['image_name']}"
+    end
+
     "#{attributes['common']['image_prefix']}#{s}"
   end
 
@@ -284,7 +289,7 @@ class Settings
 
     #
     f = file_settings_for_server(name)
-    puts "loading server settings from #{f}"
+    #puts "loading server settings from #{f}"
     t = File.read(f) rescue ''
     eval(t, settings.get_binding)
 
@@ -294,10 +299,6 @@ class Settings
     # from common config
     settings.attributes['common'] = Config.options[:common]
 
-    #puts "config options  = #{Config.options}"
-    #puts "settings000 = #{settings.attributes}"
-    #exit
-
     settings
   end
 

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,19 @@ files:
 - examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/nginx-sites/app.conf.erb.1
 - examples/example-apps-php/servers/apps-php/cookbooks/apps-php/templates/nginx-sites/default.conf.erb
 - examples/example-apps-php/servers/apps-php/readme.md
+- examples/example-apps-php/temp/apps-php.1.json
+- examples/example-base-chef/.chef/knife.rb
+- examples/example-base-chef/config.rb
+- examples/example-base-chef/readme.md
+- examples/example-base-chef/servers/my/.chef/knife.rb
+- examples/example-base-chef/servers/my/config.rb
+- examples/example-base-chef/servers/my/cookbooks/my/README.md
+- examples/example-base-chef/servers/my/cookbooks/my/metadata.rb
+- examples/example-base-chef/servers/my/cookbooks/my/recipes/build.rb
+- examples/example-base-chef/servers/my/cookbooks/my/recipes/install.rb
+- examples/example-base-chef/servers/my/cookbooks/my/recipes/install_host.rb
+- examples/example-base-chef/servers/my/readme.md
+- examples/example-base-chef/temp/my.json
 - examples/example-kafka-zookeeper/config.rb
 - examples/example-kafka-zookeeper/servers/kafka/Dockerfile
 - examples/example-kafka-zookeeper/servers/kafka/README.md
@@ -113,6 +126,7 @@ files:
 - lib/docker_builder/chef/.chef/knife.rb
 - lib/docker_builder/chef/chef_build_image.copy0.rb
 - lib/docker_builder/chef/chef_build_image.rb
+- lib/docker_builder/chef/chef_build_image_debug1.rb
 - lib/docker_builder/chef/chef_destroy_container.rb
 - lib/docker_builder/chef/chef_destroy_image.copy0.rb
 - lib/docker_builder/chef/chef_destroy_image.rb
@@ -125,6 +139,15 @@ files:
 - lib/docker_builder/config.rb
 - lib/docker_builder/config/dsl.rb
 - lib/docker_builder/config/helpers.rb
+- lib/docker_builder/cookbooks/docker-builder/README.md
+- lib/docker_builder/cookbooks/docker-builder/libraries/docker_containers_lib.rb
+- lib/docker_builder/cookbooks/docker-builder/libraries/myhelpers.rb
+- lib/docker_builder/cookbooks/docker-builder/libraries/resource_mycontainer.rb
+- lib/docker_builder/cookbooks/docker-builder/metadata.rb
+- lib/docker_builder/cookbooks/docker-builder/recipes/destroy_container.rb
+- lib/docker_builder/cookbooks/docker-builder/recipes/install_container.rb
+- lib/docker_builder/cookbooks/docker-builder/recipes/provision_container.rb
+- lib/docker_builder/cookbooks/docker-builder/resources/mycontainer.rb
 - lib/docker_builder/manager.rb
 - lib/docker_builder/server_settings.rb
 - lib/docker_builder/version.rb