Enable roundcube shell scripts to be directly executed (#238)

* Updated conditional in all variants of the docker-entrypoint.sh script to allow for shell scripts to be executed easily

* Added example

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 4ea2ff21f9f403dd39338352b8abaecd295f287a..5aaba562a477f0887a866b95786e3fc5bb1c5397 100755 (executable)
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 
 # PWD=`pwd`
 
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
   # docroot is empty
   if ! [ -e index.php -a -e bin/installto.sh ]; then
     echo >&2 "roundcubemail not found in $PWD - copying now..."

diff --git a/examples/kubernetes.yaml b/examples/kubernetes.yaml
index ac7310838962cfde1fe0958c802046238021b4a1..557c84bea2fabce5c755234f98d7bbed7d6559c6 100644 (file)
--- a/examples/kubernetes.yaml
+++ b/examples/kubernetes.yaml
@@ -145,7 +145,7 @@ spec:
       - name: roundcubemail
         image: roundcube/roundcubemail:latest-fpm-alpine
         imagePullPolicy: ""
-        env:
+        env: &env
         - name: ROUNDCUBEMAIL_DB_TYPE
           value: pgsql
         - name: ROUNDCUBEMAIL_DB_HOST
@@ -278,3 +278,25 @@ spec:
     targetPort: 80
   selector:
     service: roundcubenginx
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cleandb
+spec:
+  schedule: "@daily"
+  concurrencyPolicy: Replace
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          name:  cleandb
+        spec:
+          restartPolicy: OnFailure
+          containers:
+            - name: roundcubemail
+              image: roundcube/roundcubemail:latest-fpm-alpine
+              imagePullPolicy: ""
+              env: *env
+              args:
+                - bin/cleandb.sh

diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 4ea2ff21f9f403dd39338352b8abaecd295f287a..5aaba562a477f0887a866b95786e3fc5bb1c5397 100755 (executable)
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 
 # PWD=`pwd`
 
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
   # docroot is empty
   if ! [ -e index.php -a -e bin/installto.sh ]; then
     echo >&2 "roundcubemail not found in $PWD - copying now..."

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 4ea2ff21f9f403dd39338352b8abaecd295f287a..5aaba562a477f0887a866b95786e3fc5bb1c5397 100755 (executable)
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 
 # PWD=`pwd`
 
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
   # docroot is empty
   if ! [ -e index.php -a -e bin/installto.sh ]; then
     echo >&2 "roundcubemail not found in $PWD - copying now..."

diff --git a/nightly/docker-entrypoint.sh b/nightly/docker-entrypoint.sh
index b76d8f0023ee0db3d1e768bd4312d65a5fdbd090..f83a9337833b6aa91f08ac97c7d31390e0afa88a 100755 (executable)
--- a/nightly/docker-entrypoint.sh
+++ b/nightly/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 
 # PWD=`pwd`
 
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
   # docroot is empty
   if ! [ -e index.php -a -e bin/installto.sh ]; then
     echo >&2 "roundcubemail not found in $PWD - copying now..."

diff --git a/templates/docker-entrypoint.sh b/templates/docker-entrypoint.sh
index 4ea2ff21f9f403dd39338352b8abaecd295f287a..5aaba562a477f0887a866b95786e3fc5bb1c5397 100644 (file)
--- a/templates/docker-entrypoint.sh
+++ b/templates/docker-entrypoint.sh
@@ -3,7 +3,7 @@
 
 # PWD=`pwd`
 
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
+if  [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
   # docroot is empty
   if ! [ -e index.php -a -e bin/installto.sh ]; then
     echo >&2 "roundcubemail not found in $PWD - copying now..."