From 7048f25326ed5d474cce3b7840424f834621e7f0 Mon Sep 17 00:00:00 2001 From: ofreax Date: Wed, 11 Nov 2015 11:52:29 +0100 Subject: [PATCH 1/4] [twgit] Init hotfix 'hotfix-0.1.4'. From ccc0baa16b51acb7975682f795a06881b8490c4e Mon Sep 17 00:00:00 2001 From: ofreax Date: Wed, 11 Nov 2015 11:55:24 +0100 Subject: [PATCH 2/4] Add run cmd arguments when it's a single process image --- CHANGELOG.md | 3 +++ Makefile | 2 +- image/tool/run | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505f31f3..6bc1460a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.1.4 + - Add run cmd arguments 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 index d654d349..4ad7b43d 100644 --- 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 index aa4fbbdc..93075a0b 100755 --- 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 bash $SERVICE/run $@ # No process set else From 5ba12bc144c24671f20b3a68503c3d6b6626de86 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Nov 2015 13:44:39 +0100 Subject: [PATCH 3/4] remove bash from command line --- image/tool/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/tool/run b/image/tool/run index 93075a0b..2884a84b 100755 --- 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 From 2d40e9e4fb16079a2aa567736b7cac0103c996ae Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Nov 2015 13:46:10 +0100 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bc1460a..921967c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 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