From 2e3645f8536a969da8f4e18f9fd312ab9b2fd439 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Tue, 30 Jan 2018 13:16:40 +0100
Subject: [PATCH] Use cron.sh for the example docker-compose.yml's

---
 .../mariadb-cron-redis/apache/docker-compose.yml  | 15 +--------------
 .../mariadb-cron-redis/fpm/docker-compose.yml     | 15 +--------------
 .../mariadb-cron-redis/apache/docker-compose.yml  | 15 +--------------
 .../mariadb-cron-redis/fpm/docker-compose.yml     | 15 +--------------
 4 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 87760d6..ab30720 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -36,20 +36,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
-    user: www-data
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-        trap "break;exit" SIGHUP SIGINT SIGTERM
-
-        while [ ! -f /var/www/html/config/config.php ]; do
-          sleep 1
-        done
-
-        while true; do
-          php -f /var/www/html/cron.php
-          sleep 15m
-        done
-      EOF'
+    entrypoint: /cron.sh
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index f7b2447..92fe787 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -44,20 +44,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
-    user: www-data
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-        trap "break;exit" SIGHUP SIGINT SIGTERM
-
-        while [ ! -f /var/www/html/config/config.php ]; do
-          sleep 1
-        done
-
-        while true; do
-          php -f /var/www/html/cron.php
-          sleep 15m
-        done
-      EOF'
+    entrypoint: /cron.sh
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index 54da789..b4ff47a 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -40,20 +40,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
-    user: www-data
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-        trap "break;exit" SIGHUP SIGINT SIGTERM
-
-        while [ ! -f /var/www/html/config/config.php ]; do
-          sleep 1
-        done
-
-        while true; do
-          php -f /var/www/html/cron.php
-          sleep 15m
-        done
-      EOF'
+    entrypoint: /cron.sh
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index 8ed230a..cfbfa91 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -49,20 +49,7 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
-    user: www-data
-    entrypoint: |
-      bash -c 'bash -s <<EOF
-        trap "break;exit" SIGHUP SIGINT SIGTERM
-
-        while [ ! -f /var/www/html/config/config.php ]; do
-          sleep 1
-        done
-
-        while true; do
-          php -f /var/www/html/cron.php
-          sleep 15m
-        done
-      EOF'
+    entrypoint: /cron.sh
     depends_on:
       - db
       - redis