docker-builder 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85407e9452d3d1583bfc843e049e685916c2ff4a
-  data.tar.gz: 32eb773b8de175a3eaaf18103ab362f85ac4cc9d
+  metadata.gz: d881511665b52826f0f8e369a352bac25d63b06c
+  data.tar.gz: ddbb779ff4ea383842c19af5bced4f8c7ad5cbb7
 SHA512:
-  metadata.gz: aba259c631e9de324450d780b5d3b4ed6c440e03ec7cc9d4f9e8a9f8a06407a2c14e5f40b21eb5f8e999ea3a9da542d08ffcb63cc1edcaf5aaef9cd7d42eb1cb
-  data.tar.gz: db0a3b37091c2ff3421df6a139e655f72b308802d4c533df5b969d9d9df7200a069997ee72f91297deaadce679cdb42f928d8fee6fc0c7a5df88ac40d59a9813
+  metadata.gz: 8ae3492ddd49936ce1bd1e2344d4f1a4858caabd5265a068e5352dbfc6681faac2162adaee6be19394a861e7f18dc67d01584306003748d5aa40f105baffe5d2
+  data.tar.gz: 41136426282739c7726d7aa103f8e7b527a3fe97c08b26209e4ba6030fd30dc5c04507b2aa13fb6a875ef870dca9eda69f31d70a5fbc37489287d171ab74ea6a

data/lib/docker_builder/cli.rb

@@ -33,7 +33,7 @@ class CLI < Thor
   method_option :config_file,
                 :aliases  => '-c',
                 :type     => :string,
-                :default  => '',
+                :default  => 'config.rb',
                 :desc     => 'Path to your config.rb file.'
 
   def build
@@ -121,7 +121,7 @@ class CLI < Thor
   method_option :config_file,
                 :aliases  => '-c',
                 :type     => :string,
-                :default  => '',
+                :default  => 'config.rb',
                 :desc     => 'Path to your config.rb file.'
 
   def destroy_image
@@ -181,7 +181,7 @@ class CLI < Thor
   method_option :config_file,
                 :aliases  => '-c',
                 :type     => :string,
-                :default  => '',
+                :default  => 'config.rb',
                 :desc     => 'Path to your config.rb file.'
 
   def up
@@ -241,7 +241,7 @@ class CLI < Thor
   method_option :config_file,
                 :aliases  => '-c',
                 :type     => :string,
-                :default  => '',
+                :default  => 'config.rb',
                 :desc     => 'Path to your config.rb file.'
 
   def destroy
@@ -301,7 +301,7 @@ class CLI < Thor
   method_option :config_file,
                 :aliases  => '-c',
                 :type     => :string,
-                :default  => '',
+                :default  => 'config.rb',
                 :desc     => 'Path to your config.rb file.'
 
   def stop

data/lib/docker_builder/server_settings.rb

@@ -102,7 +102,7 @@ class ServerSettings
     if v =~ /^\./
       s = v.gsub /^\.\//, ''
 
-      res = "$PWD/#{self.name}/#{s}"
+      res = "$PWD/servers/#{self.name}/#{s}"
 
     elsif v =~ /^\/\//
       res = self.attributes['common']['dir_data']+(v.gsub /^\/\//, '')
@@ -218,6 +218,7 @@ class ServerSettings
   end
 
 
+
   ###
   def [](key)
     attributes[key]

data/lib/docker_builder/version.rb

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

data/readme.md

@@ -26,6 +26,14 @@ Provision during installation container on the host machine by:
 
 
 
+# Installation
+
+* Install gem:
+```
+gem install docker-builder
+```
+
+
 
 # Quickstart
 
@@ -225,13 +233,6 @@ http://localhost:8080
 ```
 
 
-# Installation
-
-
-Install gem:
-```
-$ gem install docker-builder
-```
 
 
 
@@ -377,9 +378,42 @@ data for nginx server:
 
 # Build container
 
+## Build from Dockerfile
+
+* config for server
+```
+'build' => {
+      'build_type' => 'Dockerfile',
+      "image_name" => "myname",
+
+      "base_image" => {} # not used
+  },
+```
+
 # Run container
 
 
+## Run from existing image
+
+* config for server
+```
+'build' => {
+      'build_type' => 'none',
+      "image_name" => "myname",
+
+      "base_image" => {
+          "name" => "mysql", 
+          "repository" => "mysql", 
+          "tag" => "3.4.9"
+      },
+  },
+      
+```
+
+it will NOT build a new Docker image.
+
+
+
 ## Run Docker container with Chef
 
 * run recipe install_host which runs on the host machine (not in container)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler