From 8362c200bafa50629dfcc3f50ad9f4e5cfba79c4 Mon Sep 17 00:00:00 2001 From: ofreax Date: Sat, 12 Dec 2015 12:15:41 +0100 Subject: [PATCH 1/7] [twgit] Init release 'release-0.2.0'. From 8c245cc23a33c00a73e990b48dd778d0c725b263 Mon Sep 17 00:00:00 2001 From: ofreax Date: Sat, 12 Dec 2015 12:19:10 +0100 Subject: [PATCH 2/7] Allow more easy image inheritance --- CHANGELOG.md | 3 +++ Makefile | 2 +- image/tool/install-service | 4 ++-- image/tool/install-service-available | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67d36f68..cc5c3db6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.2.0 + - Allow image more easy image inheritance + ## 0.1.5 - fix bug with host network diff --git a/Makefile b/Makefile index 2e2e3677..f89235a1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/light-baseimage -VERSION = 0.1.5 +VERSION = 0.2.0 .PHONY: all build test tag_latest release build-tool diff --git a/image/tool/install-service b/image/tool/install-service index 57a1d594..c8edbe93 100755 --- a/image/tool/install-service +++ b/image/tool/install-service @@ -24,14 +24,14 @@ for d in $(find /container/service -mindepth 1 -maxdepth 1 -type d | sort); do # Service container start script if [ -f "${d}/container-start.sh" ]; then echo "link ${d}/container-start.sh to /etc/my_init.d/$service" - ln -s ${d}/container-start.sh /etc/my_init.d/$service + ln -fs ${d}/container-start.sh /etc/my_init.d/$service fi # Service process if [ -f "${d}/daemon.sh" ]; then echo "link ${d}/daemon.sh to /etc/service/$service/run" mkdir -p /etc/service/$service - ln -s ${d}/daemon.sh /etc/service/$service/run + ln -fs ${d}/daemon.sh /etc/service/$service/run fi done diff --git a/image/tool/install-service-available b/image/tool/install-service-available index 48b1a3f9..0876a9ba 100755 --- a/image/tool/install-service-available +++ b/image/tool/install-service-available @@ -17,12 +17,12 @@ do if [ -f /container/service-available/$i/daemon.sh ]; then echo "link /container/service-available/$i/daemon.sh to /etc/service/$i/run" mkdir /etc/service/$i - ln -s /container/service-available/$i/daemon.sh /etc/service/$i/run + ln -sf /container/service-available/$i/daemon.sh /etc/service/$i/run fi if [ -f /container/service-available/$i/container-start.sh ]; then echo "link /container/service-available/$i/container-start.sh to /etc/my_init.d/$i" - ln -s /container/service-available/$i/container-start.sh /etc/my_init.d/$i + ln -sf /container/service-available/$i/container-start.sh /etc/my_init.d/$i fi else From ea7d6b6f6b88581b44744c8f942a2f52dbb35568 Mon Sep 17 00:00:00 2001 From: ofreax Date: Sat, 12 Dec 2015 12:19:13 +0100 Subject: [PATCH 3/7] Allow more easy image inheritance --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc5c3db6..5b0e630d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## 0.2.0 - - Allow image more easy image inheritance + - Allow more easy image inheritance ## 0.1.5 - fix bug with host network From fac8291462c898d1874deca553705965df95da35 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Dec 2015 10:09:36 +0100 Subject: [PATCH 4/7] fix #2 --- image/service-available/cron/container-start.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 image/service-available/cron/container-start.sh diff --git a/image/service-available/cron/container-start.sh b/image/service-available/cron/container-start.sh new file mode 100755 index 00000000..7c1d855c --- /dev/null +++ b/image/service-available/cron/container-start.sh @@ -0,0 +1,2 @@ +#!/bin/bash -e +touch /etc/crontab /etc/cron.d/* From 93329ca9cd1e7ed8a280b255d15915e19a1c60b6 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Dec 2015 10:10:33 +0100 Subject: [PATCH 5/7] CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b0e630d..4e8485b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 0.2.0 - Allow more easy image inheritance + - Fix cron NUMBER OF HARD LINKS > 1 ## 0.1.5 - fix bug with host network From cfc7d74f65767c8e478008e6054998b9a6287495 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Dec 2015 10:33:53 +0100 Subject: [PATCH 6/7] Makefile with build no cache --- CHANGELOG.md | 1 + Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e8485b7..ec71ae54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.2.0 - Allow more easy image inheritance - Fix cron NUMBER OF HARD LINKS > 1 + - Makefile with build no cache ## 0.1.5 - fix bug with host network diff --git a/Makefile b/Makefile index f89235a1..4d4d63f8 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,16 @@ NAME = osixia/light-baseimage VERSION = 0.2.0 -.PHONY: all build test tag_latest release build-tool +.PHONY: all build build-nocache test tag_latest release all: build build: docker build -t $(NAME):$(VERSION) --rm image +build-nocache: + docker build -t $(NAME):$(VERSION) --no-cache --rm image + test: env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats From 062a3c51eff7bb1f5340ea22fa2f8540d3c07b71 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Dec 2015 10:54:16 +0100 Subject: [PATCH 7/7] Fix cron NUMBER OF HARD LINKS > 1 --- image/service-available/cron/container-start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/service-available/cron/container-start.sh b/image/service-available/cron/container-start.sh index 7c1d855c..882d6870 100755 --- a/image/service-available/cron/container-start.sh +++ b/image/service-available/cron/container-start.sh @@ -1,2 +1,2 @@ #!/bin/bash -e -touch /etc/crontab /etc/cron.d/* +touch /etc/crontab /etc/cron.d/* /etc/cron.daily/* /etc/cron.hourly/* /etc/cron.monthly/* /etc/cron.weekly/*