luban 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7460f351021d4c9a37aeef66df70d3cc966a7f
-  data.tar.gz: 1d097ba20fd8491657825d1cc53f8f9db5ba0dc5
+  metadata.gz: 4a2c52afba7ac1fc8e47eed104a2318e486b66a6
+  data.tar.gz: 59f6cc14a8d580e5559e42d53fd4ee66b5efb5ef
 SHA512:
-  metadata.gz: 6d2371d009d05e2beaa52527becc015abcaee904e9b58e7a1c94c2d15e70b3e1bf210bdca80949e0257abde9dbe9276639c29359e19c95daa3c8124b70566f36
-  data.tar.gz: 32f3a5145815112420ab69db4134bdf2361bcedb2b6d26a3f3bf7bb23f5711a91ef1761c1684884b7b0c82362d8d400a5c197b8cce5e55123c56fea9b5601ed7
+  metadata.gz: 1ef8f2405f5422b2febace4dbc866c35f39789d98613ae526dffdb304c67a021cde884f38ddcb29689cc1af6793825fca04c4e9498e5e89f3dea4a05c81fdee6
+  data.tar.gz: 3f01d09888adc71fb2a628e1ac664bf3084b553ad73bd7e364d7ef56fa88ed925a088f737701b2674637c4ffc33e926e086ede94e7fcb348d95ea68198e7c8c4

data/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change log
 
-## Version 0.12.2 (Feb 13, 2017)
+## Version 0.12.3 (Feb 15, 2017)
+
+Minor enhancements:
+  * Added labels in docker image to show info about installed packages
+  * Added new parameter, #luban_uid, to specify user id for luban user
+    * This is mainly to address the permission issues on docker volumes
+  * Refactored luban_user and luban_uid as build arguments
+  * Used environment variable TZ to correctly control the timezone for a docker container
 
 Bug fixes:
   * Correctly composed revisions for build sources
   * Fixed a typo in the template of Dockerfile.erb
   * Checked the result of bundle install/package in Repository before proceeding to the rest steps
   * Checked the result of bundle install in Publisher before proceeding to the rest steps
+  * Removed redundant add commands in Dockerfile.erb
+  * Added proper prefix of build sources in dockerization
 
 ## Version 0.12.1 (Feb 09, 2017)
 

data/lib/luban/deployment/cli/application/docker/dockerizer.rb

@@ -141,14 +141,14 @@ module Luban
 
         def init_build_sources
           sources = { packages: packages_path }
-          releases = get_releases(releases_path)
-          if (v = releases.delete(:vendor))
-            sources[:vendor] = v 
+          releases = get_releases(releases_path, type: 'app')
+          if releases.has_key?(:"app.vendor")
+            sources[:"app.vendor"] = releases.delete(:"app.vendor") 
           end
           sources.merge!(releases)
           profile_path = releases_path.dirname.join('profile')
-          profile = directory?(profile_path) ? get_releases(profile_path) : {}
-          sources[stage.to_sym] = app_path
+          profile = directory?(profile_path) ? get_releases(profile_path, type: 'profile') : {}
+          sources["env.#{stage}".to_sym] = app_path
           sources.merge!(profile)
           sources.inject({}) do |srcs, (name, path)|
             md5 = md5_for_dir(path)
@@ -187,10 +187,22 @@ module Luban
         def compose_file; build[:path].join("docker-compose.yml"); end
         def compose_env_file; build[:path].join(".env"); end
 
-        def get_releases(path)
+        def get_releases(path, type:)
           capture(:ls, '-xtd', path.join('*')).split.
             collect { |p| File.basename(p) }.
-            inject({}) { |r, t| r[t.to_sym] = path.join(t); r }
+            inject({}) { |r, t| r["#{type}.#{t}".to_sym] = path.join(t); r }
+        end
+
+        def get_packages
+          packages.inject({}) do |pkgs, (name, package)|
+            pkgs[name] = package.class.required_packages_for(package.current_version).inject(
+                          { versions: package.installable_versions.join(', '),
+                            current_version: package.current_version }) do |pkg, (type, deps)|
+                          deps.each { |d| pkg["#{type}.#{d.name}".to_sym] = d.version }
+                          pkg
+                        end
+            pkgs
+          end
         end
 
         def dockerize_application!

data/lib/luban/deployment/cli/application/docker/templates/Dockerfile.erb

@@ -1,16 +1,13 @@
 FROM <%= base_image %>
 MAINTAINER <%= author['name'] %> <%= author['email'].inspect %>
 
-RUN adduser -ms /bin/bash <%= luban_user %> && \
-    mkdir <%= luban_root_path %> && \
-    chown -R <%= luban_user %>:<%= luban_user %> <%= luban_root_path %>
-
-<% build[:archives].each_value do |archive| -%>
-ADD <%= archive[:path].basename %> /
-<% end -%>
+ARG luban_uid
+ARG luban_user
 
-RUN ln -sf /usr/share/zoneinfo/<%= timezone %> /etc/localtime && \
-    echo "source <%= envrc_file %>" >> /home/<%= luban_user %>/.bashrc
+RUN adduser -ms /bin/bash -u $luban_uid $luban_user && \
+    mkdir <%= luban_root_path %> && \
+    chown -R $luban_user:$luban_user <%= luban_root_path %> && \
+    echo "source <%= envrc_file %>" >> /home/$luban_user/.bashrc
 
 <% build[:archives].each_value do |archive| -%>
 ADD <%= archive[:path].basename %> /
@@ -20,14 +17,20 @@ LABEL luban.project="<%= project %>" \
       luban.application="<%= project %>" \
       luban.stage="<%= stage %>" \
       <%- build[:sources].each_pair do |name, source| -%>
-      luban.<%= name %>_tag="<%= source[:tag] %>" \
+      luban.<%= name %>.source_tag="<%= source[:tag] %>" \
       <%- end -%>
       luban.build_tag="<%= build_tag %>" \
       luban.bulid_rev="<%= build[:revision] %>" \
-      luban.luban_user="<%= luban_user %>" \
+      <%- get_packages.each_pair do |name, package| -%>
+      <%- package.each_pair do |k, v| -%>
+      luban.packages.<%= name %>.<%= k %>="<%= v %>" \
+      <%- end -%>
+      <%- end -%>
+      luban.luban_uid="$luban_uid" \
+      luban.luban_user="$luban_user" \
       luban.luban_root_path="<%= luban_root_path %>"
 
-USER <%= luban_user %>
-WORKDIR /home/<%= luban_user %>
+USER $luban_user
+WORKDIR /home/$luban_user
 
 CMD ["/bin/bash"]

data/lib/luban/deployment/cli/application/docker/templates/docker-compose-env.erb

@@ -1 +1,3 @@
-COMPOSE_PROJECT_NAME="<%= project %>"
+LUBAN_UID=<%= luban_uid %>
+LUBAN_USER=<%= luban_user %>
+COMPOSE_PROJECT_NAME=<%= project %>

data/lib/luban/deployment/cli/application/docker/templates/docker-compose.yml.erb

@@ -2,8 +2,14 @@ version: "3"
 
 services:
   <%= application %>:
-    build: ./context
+    build:
+      context: ./context
+      args:
+        luban_uid: $LUBAN_UID
+        luban_user: $LUBAN_USER
     image: <%= build[:image_tag] %>
+    environment:
+      TZ: <%= timezone %>
     entrypoint: /bin/bash
     stdin_open: true
     tty: true

data/lib/luban/deployment/parameters.rb

@@ -27,7 +27,11 @@ module Luban
         end
 
         def current_user
-          ENV['USER'] || `whoami`.chomp
+          ENV['USER'] || `whoami 2>/dev/null`.chomp
+        end
+
+        def current_uid
+          `id -u #{current_user} 2>/dev/null`.chomp
         end
 
         parameter :luban_roles, default: %i(app)
@@ -118,7 +122,8 @@ module Luban
       module Docker
         extend Base
 
-        parameter :luban_user, default: 'luban'
+        parameter :luban_uid, default: ->{ current_uid }
+        parameter :luban_user, default: ->{ current_user }
         parameter :build_tag, default: '0.0.0'
         parameter :base_image, default: 'centos:7'
         parameter :timezone, default: 'UTC'

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.12.2"
+    VERSION = "0.12.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli