bricky 0.0.34 → 0.0.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjAwOWYyMGVlNTBiYjJlYjNmMTNmMTg4OTc2NDU2ZGJmZmQ3M2MzOQ==
+    MmQ0N2IzYjk0NjljMGY2YmMzNWI0YTUzMDYxMzBmM2FjZGY0ZGZjOA==
   data.tar.gz: !binary |-
-    ZWRjNDQ2ZmMxYmEwN2M2YTEzMGRiM2NkN2Y4YWM3ZmEwMzgxNThkNA==
+    YjBiM2U3M2UyY2Y5MTM3N2E3ZjhkY2JlMzk5Y2Q4MzgyZTkxNzc0MA==
 SHA512:
   metadata.gz: !binary |-
-    MmUwMGEwNWQyYTlkYjZiZDJkYWY3YTU0ZGIzYzUzNWFmMzBiMzNiZmYwMmM2
-    MzJjNDBlMWNmYzdjZTUxMjU5YmYwYzU0ZWE0YTA4MjQ1YWRhYTkwOWU5ZTZi
-    YzA1Njk4ZDJjNzVkMjgwZjQ3YjkxYjU2YTExODJhMjI3YWY2Mjc=
+    MmZmM2RhMGU0MjRjOGRhY2ZiODFmNjE3ZjVhMGNmYWZjYTc0Zjk3NWY0NGI0
+    M2MzN2Q1NjUwY2E5MjlkYzAwZjEwMzkzNGRlODBlNmZiODBmZTlhMTM5NmZj
+    MGQ2MjY5ZWEyYzIxYzA2NmZkY2I5NWYzYTNkODliZWQxODAwMDk=
   data.tar.gz: !binary |-
-    ZjU3ODg2ZTM3NzE4ZTMyOTc5NGMwYWE1OGE4ZjEwZWQyMTMyZGQxMTQ2Mjgy
-    MjhjZjZmMTFlOTNmNjVjNmZiNWQzZDdiMGViMTVhMTRmYjhhMjVhZTFjNTFj
-    ZTgzYzk2OTlhNDc5NjI2YzQ5ODhjMjU3OGFkY2FmNTRiYTZiN2M=
+    YmVlMDkyM2Q5MGU3ZjYwN2I1MzMxZmQwZmQyZjJjNGJkMjQxYzNlNzkzYzkz
+    MDBmYzZmYjQwNmMyYjliZTg2NWMyNTM0Y2FmNjlmNmVhNmQyN2ViMmIyZGI0
+    M2Q2Njk1YjFiNWVlM2U3YTMxM2I5OTk3ODdiYjNkZjgyZjg0YjA=

data/etc/bricks/debian/builder

@@ -8,7 +8,7 @@ debdch() {
     raw_tag=$(git tag | grep v | sort -t. -k 1.2,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)
     use_tag=$(echo $raw_tag | tr -d 'v')
     build_number="$(ls /builded/*$use_tag+build.*deb 2> /dev/null | wc -l)"
-    
+
     if [ $build_number -gt 0 ]
     then
         lastest=$(ls /builded/*$use_tag+build.*deb | sort | tail -1)
@@ -19,7 +19,7 @@ debdch() {
     tag="$use_tag+build.$build_number"
     echo "version: $tag"
     echo "distribution: unstable"
-    
+
     dch --distribution 'unstable' --newVersion "$tag" 'Builded by bricky.'
 }
 
@@ -31,7 +31,7 @@ debrep() {
 
 debian() {
   info 'Starting buildpackage'
-  dpkg-buildpackage -b -rfakeroot
+  dpkg-buildpackage -uc -us -b -rfakeroot
 
   info 'Moving deb files to volume'
   mv /opt/workspace/*.deb /opt/workspace/*.changes  /builded/
@@ -39,6 +39,9 @@ debian() {
 }
 
 pushd /opt/workspace/source
+  # suppress warnings
+  chmod 755 /root && touch /root/.dpkg.cfg
+
   [[ $BRICKS_DEBIAN_CHANGELOG == "true" ]] && suexec debdch
   suexec debian
   [[ $BRICKS_DEBIAN_REPOSITORY == "true" ]] && suexec debrep

data/etc/bricks/system/builder

@@ -0,0 +1 @@
+#!/bin/bash -e

data/etc/hacker/id_container/Dockerfile

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

data/lib/bricky/bricks/debian.rb

@@ -21,12 +21,8 @@ module Bricky
       end
 
       def bootstrap(bootstrap_path)
-        if config.fetch('dependencies', false)
-          src = File.expand_path('debian/control')
-          dest = "#{bootstrap_path}/control"
-
-          FileUtils.cp(src, dest) unless skip_cached_file(src, dest)
-          ["COPY control /tmp/control", "RUN yes | mk-build-deps --install /tmp/control"]
+        ["RUN apt-get install -y --force-yes libfile-fcntllock-perl"].tap do |deps|
+          deps << package_build_dependencies(bootstrap_path) if config.fetch('dependencies', false)
         end
       end
 
@@ -35,6 +31,13 @@ module Bricky
         File.expand_path(ENV.fetch('BRICKY_PACKAGE_OUTPUT_PATH', config['build']))
       end
 
+      def package_build_dependencies(bootstrap_path)
+        ["COPY control /tmp/control", "RUN yes | mk-build-deps --install /tmp/control"].tap do |deps|
+          src, dest = File.expand_path('debian/control'), "#{bootstrap_path}/control"
+          FileUtils.cp(src, dest) unless skip_cached_file(src, dest)
+        end
+      end
+
       def skip_cached_file(src, dest)
         return false if not File.exists?(dest)
 

data/lib/bricky/bricks/system.rb

@@ -0,0 +1,13 @@
+module Bricky
+  module Bricks
+    class System < Base
+      def bootstrap(bootstrap_path)
+        if config.fetch('bootstrap', false)
+          config.fetch('bootstrap').collect do |command|
+            "RUN #{command}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bricky/bricks.rb

@@ -1,13 +1,14 @@
 require "bricky/bricks/base"
 
 require "bricky/bricks/helper"
-require "bricky/bricks/ruby"
-require "bricky/bricks/rails"
 require "bricky/bricks/bundle"
 require "bricky/bricks/debian"
-require 'bricky/bricks/dotenv'
 require "bricky/bricks/mounts"
+require "bricky/bricks/rails"
+require "bricky/bricks/ruby"
 require "bricky/bricks/version"
+require 'bricky/bricks/dotenv'
+require 'bricky/bricks/system'
 
 module Bricky
   module Bricks

data/lib/bricky/commands/bootstrap.rb

@@ -28,7 +28,7 @@ module Bricky
         end
 
         def command(template_name, image_path)
-          "docker build -t #{template_name} #{image_path}"
+          "docker build --rm -t #{template_name} #{image_path}"
         end
 
         def image

data/lib/bricky/version.rb

@@ -1,4 +1,4 @@
 module Bricky
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
   CODENAME = "silver-surfer"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricky
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - andrerocker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - etc/bricks/helper/suexec
 - etc/bricks/mounts/builder
 - etc/bricks/rails/builder
+- etc/bricks/system/builder
 - etc/bricks/version/builder
 - etc/hacker/id_container/Dockerfile
 - etc/templates/Brickyfile
@@ -114,6 +115,7 @@ files:
 - lib/bricky/bricks/mounts.rb
 - lib/bricky/bricks/rails.rb
 - lib/bricky/bricks/ruby.rb
+- lib/bricky/bricks/system.rb
 - lib/bricky/bricks/version.rb
 - lib/bricky/command.rb
 - lib/bricky/commands/base.rb