Merge branch 'release/0.21.5'

mblaschke · mblaschke · commit 571798f262ec · 2016-03-24T23:15:52.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
 
+## [0.21.5] - 2016-03-24
+### Added
+- Fixed permissions automatically for /tmp if mounted as volume
+- Added error checks for samson service script
+
 ## [0.21.0] - 2016-03-20
 ### Changed
 - Improved entrypoint startup time
 - Removed entrypoint ansible provisioning if not needed
 - Added java-jre and latest npm for samson-deployment
 
+
 ## [0.20.0] - 2016-02-24
 ### Added
 - Added sqlite to base images
diff --git a/_provisioning/base/general/provision/entrypoint.d/05-permissions.sh b/_provisioning/base/general/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/_provisioning/samson-deployment/general/bin/service.d/samson.sh b/_provisioning/samson-deployment/general/bin/service.d/samson.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+set -o pipefail  ## trace ERR through pipes
+set -o errtrace  ## trace ERR through 'time command' and other functions
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+
 #############################
 # Vacuum database
 #############################
diff --git a/base/centos-7/conf/provision/entrypoint.d/05-permissions.sh b/base/centos-7/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh b/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh b/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh b/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh b/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh b/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh b/base/ubuntu-15.04/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh b/base/ubuntu-15.10/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh b/base/ubuntu-16.04/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp
diff --git a/samson-deployment/latest/conf/bin/service.d/samson.sh b/samson-deployment/latest/conf/bin/service.d/samson.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+set -o pipefail  ## trace ERR through pipes
+set -o errtrace  ## trace ERR through 'time command' and other functions
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+
 #############################
 # Vacuum database
 #############################
diff --git a/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh b/samson-deployment/latest/conf/provision/entrypoint.d/05-permissions.sh
@@ -0,0 +1,2 @@
+# Fix rights of /tmp (can be a volume)
+chmod 1777 /tmp

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Fix rights of /tmp (can be a volume)`
	`2`	`+chmod 1777 /tmp`