luban 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2c52afba7ac1fc8e47eed104a2318e486b66a6
-  data.tar.gz: 59f6cc14a8d580e5559e42d53fd4ee66b5efb5ef
+  metadata.gz: 804de7c5538bce26975d679cdd982450d838e7d8
+  data.tar.gz: 3df39da4fb9f9a17c563447d45193d4c7219628e
 SHA512:
-  metadata.gz: 1ef8f2405f5422b2febace4dbc866c35f39789d98613ae526dffdb304c67a021cde884f38ddcb29689cc1af6793825fca04c4e9498e5e89f3dea4a05c81fdee6
-  data.tar.gz: 3f01d09888adc71fb2a628e1ac664bf3084b553ad73bd7e364d7ef56fa88ed925a088f737701b2674637c4ffc33e926e086ede94e7fcb348d95ea68198e7c8c4
+  metadata.gz: e1e218f0c621d35a7bed93af3016f8eb55236e98747a1d95832f3a6bd3c1b9f62548a39fe17371108a749ba04810732e31942b17822ab25558f31e102526ce9e
+  data.tar.gz: bf1a3a6c3da8b83cd86dcebced0337694b1db533beae27ed08705a7cf613c94bd86a6c65fbe37ba11eb38745b800fa9d314658c79ca468257b9c97f2e166964c

data/CHANGELOG.md

@@ -1,13 +1,18 @@
 # Change log
 
-## Version 0.12.3 (Feb 15, 2017)
+## Version 0.12.4 (Feb 16, 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
+  * Added new Dockerfile arguments, #luban_user and #luban_uid, to specify user name and user id used in a docker container if necessary
     * This is mainly to address the permission issues on docker volumes
+    * It can be changed thru dotenv file for docker-compose
+  * Added new Dockerfile argument, #luban_root_path, to specify root path for luban deployments if necessary
+    * It can be changed thru dotenv file for docker-compose
   * Refactored luban_user and luban_uid as build arguments
   * Used environment variable TZ to correctly control the timezone for a docker container
+  * Cleaned up and optimized Dockerfile
+  * Bump up gem dependency on luban-cli to version 0.4.9
 
 Bug fixes:
   * Correctly composed revisions for build sources

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

@@ -4,15 +4,15 @@ MAINTAINER <%= author['name'] %> <%= author['email'].inspect %>
 ARG luban_uid
 ARG luban_user
 
-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
+# Add application archives
+ADD <%= build[:archives].collect { |_, a| a[:path].basename }.join(" \\\n    ") %> /
 
-<% build[:archives].each_value do |archive| -%>
-ADD <%= archive[:path].basename %> /
-<% end -%>
+# Create luban user with the given uid
+RUN adduser -ms /bin/bash -u $luban_uid $luban_user && \
+    echo "source <%= envrc_file %>" >> /home/$luban_user/.bashrc && \
+    chown -R $luban_user:$luban_user $luban_root_path
 
+# Populate image labels
 LABEL luban.project="<%= project %>" \
       luban.application="<%= project %>" \
       luban.stage="<%= stage %>" \
@@ -28,7 +28,7 @@ LABEL luban.project="<%= project %>" \
       <%- end -%>
       luban.luban_uid="$luban_uid" \
       luban.luban_user="$luban_user" \
-      luban.luban_root_path="<%= luban_root_path %>"
+      luban.luban_root_path="$luban_root_path"
 
 USER $luban_user
 WORKDIR /home/$luban_user

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

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

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

@@ -7,6 +7,7 @@ services:
       args:
         luban_uid: $LUBAN_UID
         luban_user: $LUBAN_USER
+        luban_root_path: $LUBAN_ROOT_PATH
     image: <%= build[:image_tag] %>
     environment:
       TZ: <%= timezone %>

data/lib/luban/deployment/version.rb

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

data/luban.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
-  spec.add_runtime_dependency 'luban-cli', ">=0.4.8"
+  spec.add_runtime_dependency 'luban-cli', ">=0.4.9"
   spec.add_runtime_dependency 'sshkit'
   
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement