Merge branch 'hotfix-0.1.4' into stable

osixia · Nov 19, 2015 · b20e183 · b20e183
2 parents 858463c + 2d40e9e
commit b20e183
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.4
+  - Add run cmd arguments when it's a single process image
+  - Remove bash from command when it's a single process image
+
 ## 0.1.3
   - add hostname env variable to /etc/hosts
     to make the image more friendly with kubernetes again :)

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/light-baseimage
-VERSION = 0.1.3
+VERSION = 0.1.4
 
 .PHONY: all build test tag_latest release build-tool
 

diff --git a/image/tool/run b/image/tool/run
@@ -13,7 +13,7 @@ elif [ "$nbDirectories" -eq 1 ]; then
   SERVICE=$(find /etc/service -mindepth 1 -maxdepth 1 -type d)
 
   echo "Execute /container/tool/my_init --skip-runit bash $SERVICE/run"
-  exec /container/tool/my_init --skip-runit bash $SERVICE/run
+  exec /container/tool/my_init --skip-runit $SERVICE/run $@
 
 # No process set
 else