Code improvements

Author: tmachyshyn

Dockerfile-alpine.template

@@ -11,6 +11,7 @@ RUN set -ex; \
         imap-dev \
         libzmq \
         zeromq-dev \
+        bash \
         $PHPIZE_DEPS \
     ; \
     \
@@ -37,15 +38,6 @@ RUN set -ex; \
     docker-php-ext-install posix; \
     docker-php-ext-enable zmq
 
-RUN set -ex; \
-    rm /var/spool/cron/crontabs/root
-
-RUN { \
-	echo '* * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-	echo '* * * * * sleep 20; * * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-	echo '* * * * * sleep 40; * * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-} > /var/spool/cron/crontabs/www-data
-
 # php.ini
 RUN { \
 	echo 'expose_php = Off'; \
@@ -74,9 +66,7 @@ RUN set -ex; \
     mkdir /usr/src/espocrm-upgrades; \
     chown -R www-data:www-data /usr/src/espocrm /usr/src/espocrm-upgrades
 
-COPY ./docker-entrypoint.sh /usr/local/bin/
-COPY ./docker-cron.sh /usr/local/bin/
-COPY ./docker-websocket.sh /usr/local/bin/
+COPY ./docker-*.sh  /usr/local/bin/
 
 ENTRYPOINT [ "docker-entrypoint.sh" ]
 

Dockerfile-debian.template

@@ -62,17 +62,8 @@ RUN set -ex; \
 RUN set -ex; \
     apt-get install -y --no-install-recommends \
         unzip \
-        busybox-static \
     ; \
-    rm -rf /var/lib/apt/lists/*; \
-    \
-    mkdir -p /var/spool/cron/crontabs
-
-RUN { \
-	echo '* * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-	echo '* * * * * sleep 20; * * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-	echo '* * * * * sleep 40; * * * * * cd /var/www/html; /usr/local/bin/php -f cron.php > /dev/null 2>&1'; \
-} > /var/spool/cron/crontabs/www-data
+    rm -rf /var/lib/apt/lists/*
 
 # php.ini
 RUN { \
@@ -102,9 +93,7 @@ RUN set -ex; \
     mkdir /usr/src/espocrm-upgrades; \
     chown -R www-data:www-data /usr/src/espocrm /usr/src/espocrm-upgrades
 
-COPY ./docker-entrypoint.sh /usr/local/bin/
-COPY ./docker-cron.sh /usr/local/bin/
-COPY ./docker-websocket.sh /usr/local/bin/
+COPY ./docker-*.sh  /usr/local/bin/
 
 ENTRYPOINT [ "docker-entrypoint.sh" ]
 

docker-cron.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eu
+
+/usr/local/bin/php /var/www/html/daemon.php
+
+exec "$@"

docker-daemon.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+
+set -eu
 
 DOCUMENT_ROOT="/var/www/html"
 

docker-websocket.sh

@@ -54,9 +54,7 @@ do
 			-e 's#%%CMD%%#'"$cmd"'#' \
 		"./Dockerfile-$dist.template" > "$variant/Dockerfile"
 
-    cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
-    cp docker-cron.sh "$variant/docker-cron.sh"
-    cp docker-websocket.sh "$variant/docker-websocket.sh"
+    cp docker-*.sh "$variant"/
 
 	travisEnv+='\n  - VARIANT='"$variant"
 done