Merge branch 'release-0.2.0' into stable

osixia · Dec 16, 2015 · 136c7d2 · 136c7d2
2 parents 440c868 + 062a3c5
commit 136c7d2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 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
@@ -1,13 +1,16 @@
 NAME = osixia/light-baseimage
-VERSION = 0.1.5
+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
 

diff --git a/image/service-available/cron/container-start.sh b/image/service-available/cron/container-start.sh
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+touch /etc/crontab /etc/cron.d/* /etc/cron.daily/* /etc/cron.hourly/* /etc/cron.monthly/* /etc/cron.weekly/*
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash -e
		touch /etc/crontab /etc/cron.d/* /etc/cron.daily/* /etc/cron.hourly/* /etc/cron.monthly/* /etc/cron.weekly/*