Introduce /entrypoint.d and /entrypoint.cmd

Author: mblaschke

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

@@ -60,10 +60,12 @@ function replaceTextInFile() {
  #
  ##
 function includeScriptDir() {
-    for FILE in "$1"/*.sh; do
-        # run custom scripts, only once
-        . "$FILE"
-    done
+    if [[ -d "$1" ]]; then
+        for FILE in "$1"/*.sh; do
+            # run custom scripts, only once
+            . "$FILE"
+        done
+    fi
 }
 
 ###
@@ -144,6 +146,7 @@ function runProvisionOnBuild() {
  ##
 function runProvisionEntrypoint() {
     includeScriptDir "/opt/docker/provision/entrypoint.d"
+    includeScriptDir "/entrypoint.d"
 
     runDockerProvision entrypoint
 }

docker/base/alpine-3/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml

@@ -1,8 +1,16 @@
 ---
 
-- name: Register logrotate configurations
+- name: Create /entrypoint.d
   file:
-    src:  '/opt/docker/provision/entrypoint.d'
-    dest: '/entrypoint.d'
+    path: "/entrypoint.d"
+    state: directory
+    owner: "root"
+    group: "root"
+    mode:  0700
+
+- name: Create /entrypoint.cmd
+  file:
+    src:  '/opt/docker/bin/entrypoint.d'
+    dest: '/entrypoint.cmd'
     state: link
     force: yes

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

@@ -60,10 +60,12 @@ function replaceTextInFile() {
  #
  ##
 function includeScriptDir() {
-    for FILE in "$1"/*.sh; do
-        # run custom scripts, only once
-        . "$FILE"
-    done
+    if [[ -d "$1" ]]; then
+        for FILE in "$1"/*.sh; do
+            # run custom scripts, only once
+            . "$FILE"
+        done
+    fi
 }
 
 ###
@@ -144,6 +146,7 @@ function runProvisionOnBuild() {
  ##
 function runProvisionEntrypoint() {
     includeScriptDir "/opt/docker/provision/entrypoint.d"
+    includeScriptDir "/entrypoint.d"
 
     runDockerProvision entrypoint
 }

docker/base/centos-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml

@@ -1,8 +1,16 @@
 ---
 
-- name: Register logrotate configurations
+- name: Create /entrypoint.d
   file:
-    src:  '/opt/docker/provision/entrypoint.d'
-    dest: '/entrypoint.d'
+    path: "/entrypoint.d"
+    state: directory
+    owner: "root"
+    group: "root"
+    mode:  0700
+
+- name: Create /entrypoint.cmd
+  file:
+    src:  '/opt/docker/bin/entrypoint.d'
+    dest: '/entrypoint.cmd'
     state: link
     force: yes

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

@@ -60,10 +60,12 @@ function replaceTextInFile() {
  #
  ##
 function includeScriptDir() {
-    for FILE in "$1"/*.sh; do
-        # run custom scripts, only once
-        . "$FILE"
-    done
+    if [[ -d "$1" ]]; then
+        for FILE in "$1"/*.sh; do
+            # run custom scripts, only once
+            . "$FILE"
+        done
+    fi
 }
 
 ###
@@ -144,6 +146,7 @@ function runProvisionOnBuild() {
  ##
 function runProvisionEntrypoint() {
     includeScriptDir "/opt/docker/provision/entrypoint.d"
+    includeScriptDir "/entrypoint.d"
 
     runDockerProvision entrypoint
 }

docker/base/debian-7/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml

@@ -1,8 +1,16 @@
 ---
 
-- name: Register logrotate configurations
+- name: Create /entrypoint.d
   file:
-    src:  '/opt/docker/provision/entrypoint.d'
-    dest: '/entrypoint.d'
+    path: "/entrypoint.d"
+    state: directory
+    owner: "root"
+    group: "root"
+    mode:  0700
+
+- name: Create /entrypoint.cmd
+  file:
+    src:  '/opt/docker/bin/entrypoint.d'
+    dest: '/entrypoint.cmd'
     state: link
     force: yes

docker/base/debian-8/conf/bin/config.sh

@@ -60,10 +60,12 @@ function replaceTextInFile() {
  #
  ##
 function includeScriptDir() {
-    for FILE in "$1"/*.sh; do
-        # run custom scripts, only once
-        . "$FILE"
-    done
+    if [[ -d "$1" ]]; then
+        for FILE in "$1"/*.sh; do
+            # run custom scripts, only once
+            . "$FILE"
+        done
+    fi
 }
 
 ###
@@ -144,6 +146,7 @@ function runProvisionOnBuild() {
  ##
 function runProvisionEntrypoint() {
     includeScriptDir "/opt/docker/provision/entrypoint.d"
+    includeScriptDir "/entrypoint.d"
 
     runDockerProvision entrypoint
 }

docker/base/debian-8/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml

@@ -1,8 +1,16 @@
 ---
 
-- name: Register logrotate configurations
+- name: Create /entrypoint.d
   file:
-    src:  '/opt/docker/provision/entrypoint.d'
-    dest: '/entrypoint.d'
+    path: "/entrypoint.d"
+    state: directory
+    owner: "root"
+    group: "root"
+    mode:  0700
+
+- name: Create /entrypoint.cmd
+  file:
+    src:  '/opt/docker/bin/entrypoint.d'
+    dest: '/entrypoint.cmd'
     state: link
     force: yes

docker/base/debian-9/conf/bin/config.sh

@@ -60,10 +60,12 @@ function replaceTextInFile() {
  #
  ##
 function includeScriptDir() {
-    for FILE in "$1"/*.sh; do
-        # run custom scripts, only once
-        . "$FILE"
-    done
+    if [[ -d "$1" ]]; then
+        for FILE in "$1"/*.sh; do
+            # run custom scripts, only once
+            . "$FILE"
+        done
+    fi
 }
 
 ###
@@ -144,6 +146,7 @@ function runProvisionOnBuild() {
  ##
 function runProvisionEntrypoint() {
     includeScriptDir "/opt/docker/provision/entrypoint.d"
+    includeScriptDir "/entrypoint.d"
 
     runDockerProvision entrypoint
 }

docker/base/debian-9/conf/provision/roles/webdevops-base/tasks/bootstrap/system.yml

@@ -1,8 +1,16 @@
 ---
 
-- name: Register logrotate configurations
+- name: Create /entrypoint.d
   file:
-    src:  '/opt/docker/provision/entrypoint.d'
-    dest: '/entrypoint.d'
+    path: "/entrypoint.d"
+    state: directory
+    owner: "root"
+    group: "root"
+    mode:  0700
+
+- name: Create /entrypoint.cmd
+  file:
+    src:  '/opt/docker/bin/entrypoint.d'
+    dest: '/entrypoint.cmd'
     state: link
     force: yes