Fix required root rights for entrypoint

Author: mblaschke

docker/base/alpine-3/conf/bin/bootstrap.sh

@@ -13,7 +13,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source /opt/docker/bin/config.sh
 
-rootCheck
+rootCheck "$0"
 
 # Save the buildtime
 date +%s > /opt/docker/BUILDTIME

docker/base/alpine-3/conf/bin/config.sh

@@ -12,7 +12,7 @@ PROVISION_REGISTRY_PATH="/opt/docker/etc/.registry"
 function rootCheck() {
     # Root check
     if [ "$(/usr/bin/whoami)" != "root" ]; then
-        echo "[ERROR] Must be run as root"
+        echo "[ERROR] $* must be run as root"
         exit 1
     fi
 }

docker/base/alpine-3/conf/bin/control.sh

@@ -7,7 +7,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source /opt/docker/bin/config.sh
 
-rootCheck
+rootCheck "$0"
 
 CONTROL_COMMAND="$1"
 shift

docker/base/alpine-3/conf/bin/entrypoint.d/supervisord.sh

@@ -4,6 +4,8 @@
 ## Supervisord (start daemons)
 #############################################
 
+rootCheck "supervisord"
+
 ## Start services
 exec /opt/docker/bin/service.d/supervisor.sh
 

docker/base/alpine-3/conf/bin/entrypoint.sh

@@ -13,14 +13,16 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-rootCheck
-
-if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
-    # Visible provisioning
-    runProvisionEntrypoint
-else
-    # Hidden provisioning
-    runProvisionEntrypoint  > /dev/null
+if [ "$(/usr/bin/whoami)" == "root" ]; then
+    # Only run provision if user is root
+
+    if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
+        # Visible provisioning
+        runProvisionEntrypoint
+    else
+        # Hidden provisioning
+        runProvisionEntrypoint  > /dev/null
+    fi
 fi
 
 #############################

docker/base/centos-7/conf/bin/bootstrap.sh

@@ -13,7 +13,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source /opt/docker/bin/config.sh
 
-rootCheck
+rootCheck "$0"
 
 # Save the buildtime
 date +%s > /opt/docker/BUILDTIME

docker/base/centos-7/conf/bin/config.sh

@@ -12,7 +12,7 @@ PROVISION_REGISTRY_PATH="/opt/docker/etc/.registry"
 function rootCheck() {
     # Root check
     if [ "$(/usr/bin/whoami)" != "root" ]; then
-        echo "[ERROR] Must be run as root"
+        echo "[ERROR] $* must be run as root"
         exit 1
     fi
 }

docker/base/centos-7/conf/bin/control.sh

@@ -7,7 +7,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 
 source /opt/docker/bin/config.sh
 
-rootCheck
+rootCheck "$0"
 
 CONTROL_COMMAND="$1"
 shift

docker/base/centos-7/conf/bin/entrypoint.d/supervisord.sh

@@ -4,6 +4,8 @@
 ## Supervisord (start daemons)
 #############################################
 
+rootCheck "supervisord"
+
 ## Start services
 exec /opt/docker/bin/service.d/supervisor.sh
 

docker/base/centos-7/conf/bin/entrypoint.sh

@@ -13,14 +13,16 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-rootCheck
-
-if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
-    # Visible provisioning
-    runProvisionEntrypoint
-else
-    # Hidden provisioning
-    runProvisionEntrypoint  > /dev/null
+if [ "$(/usr/bin/whoami)" == "root" ]; then
+    # Only run provision if user is root
+
+    if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
+        # Visible provisioning
+        runProvisionEntrypoint
+    else
+        # Hidden provisioning
+        runProvisionEntrypoint  > /dev/null
+    fi
 fi
 
 #############################