bricky 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI1OTMxMjE2MWNlZDY3MjM3MmVjNzg3NzU1NDRjNDA2MjZhNmYyNQ==
+    ZjM2MWMyMDM5OWQ1NjgxNTE3ODI5M2MyNGI4NzE1MDIzMTU1YzRlYg==
   data.tar.gz: !binary |-
-    N2YxNTE0ZTk2MmQ5ZjE0ZGVjN2I2ZmFiZjk2NDI1MmI5OWQwNGUwNw==
+    Njk1MDA2M2ZjYzllZDVmNTdmZjZmMzJhMTY1MjhiMDhmZmY3YjM3OQ==
 SHA512:
   metadata.gz: !binary |-
-    ODE1ZTNmMWRlMzM1MGM2YjkwYjE3MzI0OGU0OTBjY2RiYTgzYzIxMzMwNDhl
-    YTc4OWFlZjAwMTQ3MzU4OWNlNjNmNTdkZTk5ZTVjZmNmYjE4MWYyMDYyOWRj
-    N2M1M2JkZjkyYjQ4ZjlhZTA2M2Q5Yzg3YTNmYTRiYWFiMjU0OTk=
+    MGFmNzIwMDYyNDAxNzY0Njk5MmY0MWU2ZmRmYTRmMTYzYTkwZDNkMzEyYjkz
+    YTNjODdkMTAyNmYzYWRiMzIwZDIzNTIwYzdhNWE1NGUwMGJlNDJmMjQ5YzE1
+    YzBjMGZiZGM3MmRiZTc5ZjE0MjFkMWFhNDVlYmQ1OTQ2OGJiZDI=
   data.tar.gz: !binary |-
-    OTczZjFiMWIyOWI0ZmRhODA2M2RhMjlkZWRkZjgwN2U3MTRmYThhODhkNjNm
-    ODZhYWQ2NDk5ZmM1YzdkMjdhZDQ1YWNjNzZlNzQ3MTE3MTU0MjUzZDkyMWFj
-    ZGQ3MWUyMTllMmNhODNjNjMzOWMyY2IzMGY0ODZhYWQ4N2ZjNjM=
+    NTYyN2E0NGUzN2QyNzA0ZDNiNDc4MzBhZTUzZDY2MmJkYzU1Y2U5YjBjODQz
+    MzVmOGU1ZTg5NzkyOTI3ODNmNDc0MjEwYzlmNGNlMjAxMGMxZGI4Y2Q3N2Nj
+    YzQxZmU2MjUzN2NhM2UxMDVlZDI3MWVkNTQ1MjJiY2E2YzY2NTU=

data/etc/bricks/bundle/builder

@@ -1,16 +1,15 @@
-#!/bin/bash -l
+#!/bin/bash -le
 
-info() {
-  message=$1;
-  echo -e "\n\n\033[32m${message}\033[0m";
-}
+. $BRICKS_HOME/suexec
 
 execute() {
+  . $BRICKS_HOME/builder
+
   info 'Vendor project with Bundler'
-  pushd /opt/build/source
+  pushd /opt/workspace/source
     gem install bundler --conservative --no-ri --no-rdoc
     bundle install --deployment --without=development:test
   popd
 }
 
-execute
+suexec execute

data/etc/bricks/debian/builder

@@ -1,22 +1,22 @@
-#!/bin/bash -l
+#!/bin/bash -e
 
-info() {
-  message=$1;
-  echo -e "\n\n\033[32m${message}\033[0m";
-}
+. $BRICKS_HOME/suexec
+chown -R builder. /builded
 
 execute() {
+  . $BRICKS_HOME/builder
+
   info 'Starting buildpackage'
-  pushd /opt/build/source
+  pushd /opt/workspace/source
     dpkg-buildpackage -b -rfakeroot
   popd
 
   info 'Moving deb files to volume'
-  rm -R /builded/*
-  mv /opt/build/*.deb /builded/
+  rm -Rf /builded/*
+  mv /opt/workspace/*.deb /builded/
 
   info 'Recreating local debian packages index'
   dpkg-scanpackages /builded/ | gzip > /builded/Packages.gz
 }
 
-execute
+suexec execute

data/etc/bricks/helper/builder

@@ -0,0 +1,6 @@
+#!/bin/bash -le
+
+info() {
+  message=$1;
+  echo -e "\n\n\033[32m${message}\033[0m";
+}

data/etc/bricks/helper/suexec

@@ -0,0 +1,7 @@
+#!/bin/bash -le
+
+suexec() {
+  name=$1
+  export -f $name
+  su builder -c "bash -c $name"
+}

data/etc/bricks/mounts/builder

@@ -1,14 +1,11 @@
-#!/bin/bash -l
+#!/bin/bash -le
 
-info() {
-  message=$1;
-  echo -e "\n\n\033[32m${message}\033[0m";
-}
+. $BRICKS_HOME/builder
 
 execute() {
-  info 'Copying files'
-  rsync -a --stats /bricks/mounts/volumes/ /opt/build
+  info 'Building workspace'
+  rsync -a --stats /bricks/mounts/volumes/ /opt/workspace
+  chown -R builder. /opt/workspace
 }
 
-
 execute

data/etc/hacker/id_container/Dockerfile

@@ -0,0 +1,3 @@
+FROM <%= self.image %>
+RUN useradd -u <%= self.uid %> builder
+RUN mkdir -p /opt/workspace && chown -R builder. /opt

data/etc/templates/bricky/bricky.yml

@@ -4,7 +4,6 @@ bricky:
   bricks:
     mounts:
       source: .
-      bricky: ../bricky
     bundle:
       cache: true
     debian:

data/lib/bricky/bricks/base.rb

@@ -0,0 +1,19 @@
+module Bricky
+  module Bricks
+    class Base
+      attr_accessor :config
+
+      def initialize(config)
+        self.config = config
+      end
+
+      def entrypoint
+      end
+
+      private
+        def bricks_path
+          Bricky.config.bricks_path
+        end
+    end
+  end
+end

data/lib/bricky/bricks/bundle.rb

@@ -1,6 +1,8 @@
+require "fileutils"
+
 module Bricky
   module Bricks
-    class Bundle < Helper
+    class Bundle < Base
       def arguments
         scripts_path = "#{bricks_path}/bundle"
         results = ["-v #{scripts_path}:/bricks/bundle"]
@@ -14,8 +16,17 @@ module Bricky
 
       private
         def cached
-          digest = Digest::MD5.file('Gemfile').hexdigest
-          ["-v /tmp/bricky/cache/#{digest}:/opt/build/source/vendor/bundle"]
+          ["-v #{local_path}:/opt/workspace/source/vendor/bundle"]
+        end
+
+        def local_path
+          path = "/tmp/bricky/cache/#{digest}"
+          FileUtils::mkdir_p(path)
+          path
+        end
+
+        def digest
+          Digest::MD5.file('Gemfile').hexdigest
         end
     end
   end

data/lib/bricky/bricks/debian.rb

@@ -1,6 +1,6 @@
 module Bricky
   module Bricks
-    class Debian < Helper
+    class Debian < Base
       def arguments
         builded_path = File.expand_path(config["build"])
         scripts_path = "#{bricks_path}/debian"

data/lib/bricky/bricks/helper.rb

@@ -1,16 +1,10 @@
 module Bricky
   module Bricks
-    class Helper
-      attr_accessor :config
-
-      def initialize(config)
-        self.config = config
+    class Helper < Base
+      def arguments
+        ["-v #{bricks_path}/helper:/bricks/helper",
+          "-e BRICKS_HOME=/bricks/helper"]
       end
-
-      private
-        def bricks_path
-          File.expand_path("../../../../etc/bricks", __FILE__)
-        end
     end
   end
 end

data/lib/bricky/bricks/mounts.rb

@@ -1,6 +1,6 @@
 module Bricky
   module Bricks
-    class Mounts < Helper
+    class Mounts < Base
       def arguments
         scripts_path = "#{bricks_path}/mounts"
         command = "-v #{scripts_path}:/bricks/mounts"

data/lib/bricky/bricks.rb

@@ -1,6 +1,6 @@
-require "byebug"
-require "bricky/bricks/helper"
+require "bricky/bricks/base"
 
+require "bricky/bricks/helper"
 require "bricky/bricks/ruby"
 require "bricky/bricks/bundle"
 require "bricky/bricks/debian"
@@ -13,7 +13,7 @@ module Bricky
     def resolve
        Bricky.config.bricks.collect do |name, config|
         resolve_and_initialize(name, config)
-      end.uniq
+       end.uniq << Bricky::Bricks::Helper.new({})
     end
 
     def resolve_and_initialize(name, config)

data/lib/bricky/commands/bootstrap.rb

@@ -1,3 +1,6 @@
+require "etc"
+require "fileutils"
+
 module Bricky
   module Commands
     module Bootstrap
@@ -10,12 +13,16 @@ module Bricky
 
       private
         def build(image)
-          code = command(image.name, image.path)
-          puts "Processing #{name} image: ".colorize(:blue) + code
-          
-          unless system(code)
-            puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red
-            return false
+          base = command(image.name, image.path)
+          hack = command(image.name, create_hack_image(image))
+
+          [base, hack].each do |code|
+            puts "Processing #{name} image: ".colorize(:blue) + code
+            
+            unless system(code)
+              puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red
+              return false
+            end
           end
 
           true
@@ -26,7 +33,26 @@ module Bricky
         end
 
         def images
-          ["builder", "runtime"].collect {|image| Bricky::Image.new(image) }
+          ["builder"].collect {|image| Bricky::Image.new(image) }
+        end
+
+        def create_hack_image(image)
+          hack_path = FileUtils::mkdir_p("/tmp/bricky/containers/#{Bricky.config.name}").first
+          File.open("#{hack_path}/Dockerfile", "w") { |file| file.write(parse_hack_template(image)) }
+          hack_path
+        end
+
+        def parse_hack_template(image)
+          template = "#{Bricky.config.hacker_path}/id_container/Dockerfile"
+          parser = ERB.new(open(template).read)
+          variables = OpenStruct.new({ "image" => image.name, uid: Etc.getpwuid.uid })
+
+          # :(
+          def variables.get_binding
+            binding
+          end
+
+          parser.result(variables.get_binding)
         end
     end
   end

data/lib/bricky/commands/builder.rb

@@ -13,9 +13,9 @@ module Bricky
       private
         def build(image)
           code = command(image)
-          puts "Execute build: ".colorize(:blue) + code
+          puts format(code)
           
-          unless system(code.gsub(/\n/, ""))
+          unless system(code)
             puts "~~~~~~~~~~~ Problems building image ~~~~~~~~~~~".colorize(:white).on_red
             return false
           end
@@ -26,10 +26,14 @@ module Bricky
         def command(image)
           bricks = Bricky::Bricks.resolve
           arguments = bricks.collect(&:arguments).uniq.join(" ")
-          entrypoints = bricks.collect(&:entrypoint).uniq.join(";")
+          entrypoints = bricks.collect(&:entrypoint).compact.uniq.join(" && ")
 
           "docker run #{arguments} -i -t #{image.name} /bin/bash -l -c '#{entrypoints}'"
         end
+
+        def format(command)
+          command.split("-v ").join("\n\t -v ").split("-i ").join("\n\t -i ")
+        end
     end
   end
 end

data/lib/bricky/config.rb

@@ -14,8 +14,12 @@ module Bricky
       self.bricks = config["bricks"]
     end
 
-    def full_scripts_path
-      File.expand_path("#{base_path}/bricky/containers/scripts", __FILE__)
+    def bricks_path
+      File.expand_path("#{base_path}/etc/bricks", __FILE__)
+    end
+
+    def hacker_path
+      File.expand_path("#{base_path}/etc/hacker", __FILE__)
     end
 
     private

data/lib/bricky/version.rb

@@ -1,3 +1,3 @@
 module Bricky
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,13 +91,16 @@ files:
 - bin/bricky
 - etc/bricks/bundle/builder
 - etc/bricks/debian/builder
+- etc/bricks/helper/builder
+- etc/bricks/helper/suexec
 - etc/bricks/mounts/builder
+- etc/hacker/id_container/Dockerfile
 - etc/templates/Brickyfile
 - etc/templates/bricky/bricky.yml
 - etc/templates/bricky/images/builder/Dockerfile
-- etc/templates/bricky/images/runtime/Dockerfile
 - lib/bricky.rb
 - lib/bricky/bricks.rb
+- lib/bricky/bricks/base.rb
 - lib/bricky/bricks/bundle.rb
 - lib/bricky/bricks/debian.rb
 - lib/bricky/bricks/helper.rb
@@ -132,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: a new way to build and package applications

data/etc/templates/bricky/images/runtime/Dockerfile

@@ -1,2 +0,0 @@
-FROM locaweb/wheezy
-MAINTAINER bricky