docker-builder 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7402bf36321129a23e0de870efa54e445c3876
-  data.tar.gz: cfeaa7e2a406d013dc88513079ab5d39775b29ba
+  metadata.gz: e832d508142c8ff9a62334fd697d243ab26b6cd7
+  data.tar.gz: 8fd2471f7fcde3212c2fb9eddb9ae4fcc4b8dacf
 SHA512:
-  metadata.gz: dd608f385811340691f81e0366751bcf9a832507caa68a9549d94eb12366c6d5321d6204b65146b22c959565d8c1a81ca957b423c79d4e0caf24d6bea91e72d1
-  data.tar.gz: f17bb38bed31308d94a9536063260a7a6b370a327f8c8d100ebb63c01ebfb5794687b49b548e4c0349e5a60b6b1b4a17571845b758580f1d981554749484d835
+  metadata.gz: 4a39d9ad9ace6555b515290836f47358abbe85c1e4f6713ad4508e022d5994bf9ef3b6b4fd508ba06c1028e87fce6fd05ebc2b58ce75701e2e6e4949522e7c98
+  data.tar.gz: 2673f18151df9441e6fbca6d3a8a68fe363916fc60bae5d21c06ba389614722edb315304af96741166de4b19d39b2e91becf6c73eb4a6e39a2762fd4f0acb4af

data/examples/example-kafka-zookeeper/config.rb

@@ -0,0 +1,84 @@
+# my vars
+KAFKA_HOSTNAME = '10.1.0.12'
+
+#
+common({
+    'prefix' => "ex-",
+    'image_prefix' => 'ex-',
+    'dir_data' => '/disk3/data/ex-kafka-zookeeper/',
+
+})
+
+servers({
+    'zookeeper'=>{
+        'build' => {
+            'build_type' => 'none',
+            "image_name" => "", # not used
+
+
+            "base_image" => {
+                #"name" => "wurstmeister/zookeeper",
+                #"repository" => "wurstmeister/zookeeper",
+
+                #"name" => "jplock/zookeeper",
+                #"repository" => "jplock/zookeeper",
+
+                "name" => "zookeeper",
+                "repository" => "zookeeper",
+                "tag" => "3.4.9"
+
+            },
+        },
+        'docker'=> {
+            #"command"=> "",
+            'ports' => [
+                [2181,2181],
+            ],
+            'volumes' => [
+            ],
+            'links' => [
+
+            ]
+        },
+        'attributes' => {
+        }
+
+    },
+    'kafka'=>{
+        'build' => {
+            'build_type' => 'Dockerfile',
+            "image_name" => "kafka",
+
+            "base_image" => {} # not used
+        },
+        'docker'=> {
+            #"command"=> "",
+            'ports' => [
+                [9092,9092],
+            ],
+            'volumes' => [
+                ["docker.sock", '/var/run/docker.sock']
+            ],
+            'links' => [
+                ['zookeeper', 'zookeeper']
+            ],
+            'run_env' =>[
+                ['KAFKA_ADVERTISED_HOST_NAME', KAFKA_HOSTNAME],
+                ['KAFKA_ADVERTISED_PORT', 9092],
+                ['KAFKA_CREATE_TOPICS', "test:1:1"],
+                ['KAFKA_ZOOKEEPER_CONNECT', 'zookeeper:2181']
+            ]
+        },
+        'attributes' => {
+        }
+    },
+
+
+})
+
+
+
+
+base({
+
+})

data/examples/example-kafka-zookeeper/servers/kafka/Dockerfile

@@ -0,0 +1,21 @@
+FROM anapsix/alpine-java
+
+MAINTAINER MaxIvak
+
+RUN apk add --update unzip wget curl docker jq coreutils
+
+ENV KAFKA_VERSION="0.10.0.1" SCALA_VERSION="2.11"
+
+ADD files/download-kafka.sh /tmp/download-kafka.sh
+RUN /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz
+
+VOLUME ["/kafka"]
+
+ENV KAFKA_HOME /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}
+
+ADD files/start-kafka.sh /usr/bin/start-kafka.sh
+ADD files/broker-list.sh /usr/bin/broker-list.sh
+ADD files/create-topics.sh /usr/bin/create-topics.sh
+
+# Use "exec" form so that it runs as PID 1 (useful for graceful shutdown)
+CMD ["start-kafka.sh"]

data/examples/example-kafka-zookeeper/servers/kafka/README.md

@@ -0,0 +1,78 @@
+[![Docker Pulls](https://img.shields.io/docker/pulls/wurstmeister/kafka.svg)](https://hub.docker.com/r/wurstmeister/kafka/)
+[![Docker Stars](https://img.shields.io/docker/stars/wurstmeister/kafka.svg)](https://hub.docker.com/r/wurstmeister/kafka/)
+[![](https://badge.imagelayers.io/wurstmeister/kafka:latest.svg)](https://imagelayers.io/?images=wurstmeister/kafka:latest)
+
+kafka-docker
+============
+
+Dockerfile for [Apache Kafka](http://kafka.apache.org/)
+
+The image is available directly from https://registry.hub.docker.com/
+
+##Pre-Requisites
+
+- install docker-compose [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/)
+- modify the ```KAFKA_ADVERTISED_HOST_NAME``` in ```docker-compose.yml``` to match your docker host IP (Note: Do not use localhost or 127.0.0.1 as the host ip if you want to run multiple brokers.)
+- if you want to customise any Kafka parameters, simply add them as environment variables in ```docker-compose.yml```, e.g. in order to increase the ```message.max.bytes``` parameter set the environment to ```KAFKA_MESSAGE_MAX_BYTES: 2000000```. To turn off automatic topic creation set ```KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'```
+
+##Usage
+
+Start a cluster:
+
+- ```docker-compose up -d ```
+
+Add more brokers:
+
+- ```docker-compose scale kafka=3```
+
+Destroy a cluster:
+
+- ```docker-compose stop```
+
+##Note
+
+The default ```docker-compose.yml``` should be seen as a starting point. By default each broker will get a new port number and broker id on restart. Depending on your use case this might not be desirable. If you need to use specific ports and broker ids, modify the docker-compose configuration accordingly, e.g. [docker-compose-single-broker.yml](https://github.com/wurstmeister/kafka-docker/blob/master/docker-compose-single-broker.yml):
+
+- ```docker-compose -f docker-compose-single-broker.yml up```
+
+##Broker IDs
+
+If you don't specify a broker id in your docker-compose file, it will automatically be generated (see [https://issues.apache.org/jira/browse/KAFKA-1070](https://issues.apache.org/jira/browse/KAFKA-1070). This allows scaling up and down. In this case it is recommended to use the ```--no-recreate``` option of docker-compose to ensure that containers are not re-created and thus keep their names and ids.
+
+
+##Automatically create topics
+
+If you want to have kafka-docker automatically create topics in Kafka during
+creation, a ```KAFKA_CREATE_TOPICS``` environment variable can be
+added in ```docker-compose.yml```.
+
+Here is an example snippet from ```docker-compose.yml```:
+
+        environment:
+          KAFKA_CREATE_TOPICS: "Topic1:1:3,Topic2:1:1"
+
+```Topic 1``` will have 1 partition and 3 replicas, ```Topic 2``` will have 1 partition and 1 replica.
+
+##Advertised hostname 
+
+You can configure the advertised hostname in different ways 
+
+1. explicitly, using ```KAFKA_ADVERTISED_HOST_NAME``` 
+2. via a command, using ```HOSTNAME_COMMAND```, e.g. ```HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"```
+
+When using commands, make sure you review the "Variable Substitution" section in [https://docs.docker.com/compose/compose-file/](https://docs.docker.com/compose/compose-file/)
+
+If ```KAFKA_ADVERTISED_HOST_NAME``` is specified, it takes presendence over ```HOSTNAME_COMMAND```
+
+For AWS deployment, you can use the Metadata service to get the container host's IP:
+```
+HOSTNAME_COMMAND=wget -t3 -T2 -qO-  http://169.254.169.254/latest/meta-data/local-ipv4
+```
+Reference: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
+
+##Tutorial
+
+[http://wurstmeister.github.io/kafka-docker/](http://wurstmeister.github.io/kafka-docker/)
+
+
+

data/examples/example-kafka-zookeeper/servers/kafka/files/LICENSE

@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

data/examples/example-kafka-zookeeper/servers/kafka/files/broker-list.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+CONTAINERS=$(docker ps | grep 9092 | awk '{print $1}')
+BROKERS=$(for CONTAINER in $CONTAINERS; do docker port $CONTAINER 9092 | sed -e "s/0.0.0.0:/$HOST_IP:/g"; done)
+echo $BROKERS | sed -e 's/ /,/g'

data/examples/example-kafka-zookeeper/servers/kafka/files/create-topics.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+
+if [[ -z "$START_TIMEOUT" ]]; then
+    START_TIMEOUT=600
+fi
+
+start_timeout_exceeded=false
+count=0
+step=10
+while netstat -lnt | awk '$4 ~ /:'$KAFKA_PORT'$/ {exit 1}'; do
+    echo "waiting for kafka to be ready"
+    sleep $step;
+    count=$(expr $count + $step)
+    if [ $count -gt $START_TIMEOUT ]; then
+        start_timeout_exceeded=true
+        break
+    fi
+done
+
+if $start_timeout_exceeded; then
+    echo "Not able to auto-create topic (waited for $START_TIMEOUT sec)"
+    exit 1
+fi
+
+if [[ -n $KAFKA_CREATE_TOPICS ]]; then
+    IFS=','; for topicToCreate in $KAFKA_CREATE_TOPICS; do
+        echo "creating topics: $topicToCreate" 
+        IFS=':' read -a topicConfig <<< "$topicToCreate"
+        JMX_PORT='' $KAFKA_HOME/bin/kafka-topics.sh --create --zookeeper $KAFKA_ZOOKEEPER_CONNECT --replication-factor ${topicConfig[2]} --partition ${topicConfig[1]} --topic "${topicConfig[0]}"
+    done
+fi

data/examples/example-kafka-zookeeper/servers/kafka/files/download-kafka.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mirror=$(curl --stderr /dev/null https://www.apache.org/dyn/closer.cgi\?as_json\=1 | jq -r '.preferred')
+url="${mirror}kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz"
+wget -q "${url}" -O "/tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz"

data/examples/example-kafka-zookeeper/servers/kafka/files/start-kafka-shell.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -e HOST_IP=$1 -e ZK=$2 -i -t wurstmeister/kafka /bin/bash

data/examples/example-kafka-zookeeper/servers/kafka/files/start-kafka.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+if [[ -z "$KAFKA_PORT" ]]; then
+    export KAFKA_PORT=9092
+fi
+if [[ -z "$KAFKA_ADVERTISED_PORT" ]]; then
+    export KAFKA_ADVERTISED_PORT=$(docker port `hostname` $KAFKA_PORT | sed -r "s/.*:(.*)/\1/g")
+fi
+if [[ -z "$KAFKA_BROKER_ID" ]]; then
+    # By default auto allocate broker ID
+    export KAFKA_BROKER_ID=-1
+fi
+if [[ -z "$KAFKA_LOG_DIRS" ]]; then
+    export KAFKA_LOG_DIRS="/kafka/kafka-logs-$HOSTNAME"
+fi
+if [[ -z "$KAFKA_ZOOKEEPER_CONNECT" ]]; then
+    export KAFKA_ZOOKEEPER_CONNECT=$(env | grep ZK.*PORT_2181_TCP= | sed -e 's|.*tcp://||' | paste -sd ,)
+fi
+
+if [[ -n "$KAFKA_HEAP_OPTS" ]]; then
+    sed -r -i "s/(export KAFKA_HEAP_OPTS)=\"(.*)\"/\1=\"$KAFKA_HEAP_OPTS\"/g" $KAFKA_HOME/bin/kafka-server-start.sh
+    unset KAFKA_HEAP_OPTS
+fi
+
+if [[ -z "$KAFKA_ADVERTISED_HOST_NAME" && -n "$HOSTNAME_COMMAND" ]]; then
+    export KAFKA_ADVERTISED_HOST_NAME=$(eval $HOSTNAME_COMMAND)
+fi
+
+for VAR in `env`
+do
+  if [[ $VAR =~ ^KAFKA_ && ! $VAR =~ ^KAFKA_HOME ]]; then
+    kafka_name=`echo "$VAR" | sed -r "s/KAFKA_(.*)=.*/\1/g" | tr '[:upper:]' '[:lower:]' | tr _ .`
+    env_var=`echo "$VAR" | sed -r "s/(.*)=.*/\1/g"`
+    if egrep -q "(^|^#)$kafka_name=" $KAFKA_HOME/config/server.properties; then
+        sed -r -i "s@(^|^#)($kafka_name)=(.*)@\2=${!env_var}@g" $KAFKA_HOME/config/server.properties #note that no config values may contain an '@' char
+    else
+        echo "$kafka_name=${!env_var}" >> $KAFKA_HOME/config/server.properties
+    fi
+  fi
+done
+
+if [[ -n "$CUSTOM_INIT_SCRIPT" ]] ; then
+  eval $CUSTOM_INIT_SCRIPT
+fi
+
+
+KAFKA_PID=0
+
+# see https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86#.bh35ir4u5
+term_handler() {
+  echo 'Stopping Kafka....'
+  if [ $KAFKA_PID -ne 0 ]; then
+    kill -s TERM "$KAFKA_PID"
+    wait "$KAFKA_PID"
+  fi
+  echo 'Kafka stopped.'
+  exit
+}
+
+
+# Capture kill requests to stop properly
+trap "term_handler" SIGHUP SIGINT SIGTERM
+create-topics.sh & 
+$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties &
+KAFKA_PID=$!
+
+wait

data/lib/docker_builder/cli.rb

@@ -51,8 +51,15 @@ class CLI < Thor
     begin
       Config.load(options)
 
+      #puts "config servers: #{Config.inspect}"
+      #puts "config: #{Config.options.inspect}"
+      #exit
+
       Config.servers.each do |name, opts|
-        server_settings = Manager.load_settings(name, opts)
+        server_settings = Settings.load_settings_for_server(name, opts)
+
+        #puts "s: #{server_settings.inspect}"
+        #exit
 
         Manager.destroy_image(name, server_settings)
         Manager.build_image(name, server_settings)
@@ -125,13 +132,13 @@ class CLI < Thor
 
     begin
       Config.load(options)
-
-      puts "root: #{Config.root_path}"
-
-      #puts "servers: #{Config.servers.inspect}"
+      puts "config: #{Config.inspect}"
 
       Config.servers.each do |name, opts|
-        server_settings = Manager.load_settings(name, opts)
+        server_settings = Settings.load_settings_for_server(name, opts)
+
+        puts "s: #{server_settings.inspect}"
+        exit
 
         Manager.destroy_image(name, server_settings)
       end
@@ -191,7 +198,7 @@ class CLI < Thor
       Config.load(options)
 
       Config.servers.each do |name, opts|
-        server_settings = Manager.load_settings(name, opts)
+        server_settings = Settings.load_settings_for_server(name, opts)
 
         Manager.destroy_container(name, server_settings)
         Manager.run_container(name, server_settings)
@@ -251,7 +258,7 @@ class CLI < Thor
       Config.load(options)
 
       Config.servers.each do |name, opts|
-        server_settings = Manager.load_settings(name, opts)
+        server_settings = Settings.load_settings_for_server(name, opts)
 
         Manager.destroy_container(name, server_settings)
       end

data/lib/docker_builder/config.rb

@@ -16,7 +16,7 @@ module DockerBuilder
     class << self
       #include Utilities::Helpers
 
-      attr_reader :server, :root_path, :config_file, :tmp_path, :options
+      attr_reader :servers, :root_path, :config_file, :tmp_path, :options
 
 
       # Define on self, since it's  a class method
@@ -92,7 +92,8 @@ module DockerBuilder
       def load_servers(opts)
         # Identify all servers
         if opts[:server]
-          options[:servers] = {opts[:server]=>{}}
+          server_name = opts[:server]
+          options[:servers] = {server_name=>options[:servers][server_name] }
         else
           # get from config
           #options[:servers] = options[:servers]

data/lib/docker_builder/manager.rb

@@ -1,15 +1,6 @@
 module DockerBuilder
 class Manager
 
-
-  def self.load_settings(server_name, opts={})
-    settings = Settings.load_settings_for_server(server_name, opts)
-
-    settings.set 'name', server_name
-
-    settings
-  end
-
   def self.save_chef_config(settings)
     require 'json'
     filename = settings.filename_chef_config
@@ -30,19 +21,23 @@ class Manager
 
     #settings = load_settings(server_name)
 
-    if settings['build']['build_type']=='dockerfile'
+    t = settings['build']['build_type']
+    if t=='' || t=='none'
+      #
+      puts "no build needed..."
+
+    elsif t.downcase=='dockerfile'
       return build_image_with_dockerfile(settings)
-    elsif settings['build']['build_type']=='chef'
+    elsif t=='chef'
       return build_image_with_chef(settings)
     end
   end
 
   def self.build_image_with_dockerfile(settings)
-    puts "build image with Dockerfile. Image: #{settings.image_name}"
-
-    name = settings['name']
+    puts "build image with Dockerfile"
 
-    cmd %Q(cd #{name} && docker build -t #{settings.image_name} . )
+    #cmd %Q(cd #{name} && docker build -t #{settings.image_name} . )
+    cmd %Q(docker build -t #{settings.image_name} #{settings.dir_server_root} )
 
   end
 
@@ -128,6 +123,9 @@ class Manager
 
     script_type = (settings['install']['node']['script_type'] rescue nil)
 
+    puts "script type: #{script_type}"
+
+
     if script_type && script_type=='chef_recipe'
       # run container and provision with chef
       _run_container_chef(settings)

data/lib/docker_builder/server_settings.rb

@@ -69,9 +69,22 @@ class ServerSettings
   def image_name
     s = attributes['name']
 
+    if !need_build?
+      bi = attributes['build']['base_image']
+      return "#{bi['name']}:#{bi['tag']}"
+    end
+
     "#{attributes['common']['image_prefix']}#{s}"
   end
 
+  def need_build?
+    build_type = attributes['build']['build_type']
+    return false if build_type=='' || build_type=='none'
+
+
+    true
+  end
+
   def container_name(name=nil)
     name ||= attributes['name']
     s = name
@@ -239,6 +252,13 @@ class Settings
   def self.load_settings_for_server(name, opts={})
     settings = ServerSettings.new
 
+    settings.set 'name', name
+
+    # set from main Config
+    Config.servers[name].each do |k,v|
+      settings.attributes[k]=v
+    end
+
 
     #puts "current=#{File.dirname(__FILE__)}"
     #puts "ff=#{file_base_settings}"

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/templates/example-chef/.chef/knife.rb

@@ -0,0 +1,5 @@
+### add cookbooks
+#cookbook_path cookbook_path+[
+#    '/work/chef-repo/cookbooks-common',
+#    '/work/chef-repo/cookbooks',
+#]

data/readme.md

@@ -141,6 +141,14 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 * CHEF_COOKBOOKS - list of paths to chef cookbooks
 
 
+# Build Docker image
+
+Build types:
+* 'none' - no build required
+* 'Dockerfile' - using Dockerfile and docker build command
+* 'chef' - using Chef provisioning
+
+
 # Chef provisioning
 
 * add additional paths for cookbooks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Max Ivak
@@ -83,6 +83,15 @@ 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-kafka-zookeeper/config.rb
+- examples/example-kafka-zookeeper/servers/kafka/Dockerfile
+- examples/example-kafka-zookeeper/servers/kafka/README.md
+- examples/example-kafka-zookeeper/servers/kafka/files/LICENSE
+- examples/example-kafka-zookeeper/servers/kafka/files/broker-list.sh
+- examples/example-kafka-zookeeper/servers/kafka/files/create-topics.sh
+- examples/example-kafka-zookeeper/servers/kafka/files/download-kafka.sh
+- examples/example-kafka-zookeeper/servers/kafka/files/start-kafka-shell.sh
+- examples/example-kafka-zookeeper/servers/kafka/files/start-kafka.sh
 - examples/example-nginx/config.rb
 - examples/example-nginx/servers/nginx/.chef/knife.rb
 - examples/example-nginx/servers/nginx/config.rb
@@ -109,6 +118,7 @@ files:
 - lib/docker_builder/manager.rb
 - lib/docker_builder/server_settings.rb
 - lib/docker_builder/version.rb
+- lib/templates/example-chef/.chef/knife.rb
 - lib/templates/example-chef/config.rb.erb
 - lib/templates/example-chef/servers/server1/.chef/knife.rb
 - lib/templates/example-chef/servers/server1/config.rb.erb