From 5f041a62494b942aa8547460685c7188fa04c344 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Sun, 13 Aug 2017 13:03:54 +0200
Subject: [PATCH] Merge cron and redis example

---
 .../apache/app/Dockerfile                     |  0
 .../apache/app/autoconfig.php                 |  0
 .../apache/app/redis.config.php               |  0
 .../apache/db.env                             |  0
 .../apache/docker-compose.yml                 |  6 ++++
 .../mariadb-with-cron/apache/app/Dockerfile   |  3 --
 .../apache/app/autoconfig.php                 | 10 ------
 .../insecure/mariadb-with-redis/apache/db.env |  3 --
 .../apache/docker-compose.yml                 | 34 -------------------
 9 files changed, 6 insertions(+), 50 deletions(-)
 rename .examples/docker-compose/insecure/{mariadb-with-redis => mariadb-cron-redis}/apache/app/Dockerfile (100%)
 rename .examples/docker-compose/insecure/{mariadb-with-cron => mariadb-cron-redis}/apache/app/autoconfig.php (100%)
 rename .examples/docker-compose/insecure/{mariadb-with-redis => mariadb-cron-redis}/apache/app/redis.config.php (100%)
 rename .examples/docker-compose/insecure/{mariadb-with-cron => mariadb-cron-redis}/apache/db.env (100%)
 rename .examples/docker-compose/insecure/{mariadb-with-cron => mariadb-cron-redis}/apache/docker-compose.yml (91%)
 delete mode 100644 .examples/docker-compose/insecure/mariadb-with-cron/apache/app/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/mariadb-with-redis/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/mariadb-with-redis/apache/db.env
 delete mode 100644 .examples/docker-compose/insecure/mariadb-with-redis/apache/docker-compose.yml

diff --git a/.examples/docker-compose/insecure/mariadb-with-redis/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb-with-redis/apache/app/Dockerfile
rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
diff --git a/.examples/docker-compose/insecure/mariadb-with-cron/apache/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb-with-cron/apache/app/autoconfig.php
rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php
diff --git a/.examples/docker-compose/insecure/mariadb-with-redis/apache/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb-with-redis/apache/app/redis.config.php
rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php
diff --git a/.examples/docker-compose/insecure/mariadb-with-cron/apache/db.env b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb-with-cron/apache/db.env
rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/db.env
diff --git a/.examples/docker-compose/insecure/mariadb-with-cron/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
similarity index 91%
rename from .examples/docker-compose/insecure/mariadb-with-cron/apache/docker-compose.yml
rename to .examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 48371206..f5ae21fc 100644
--- a/.examples/docker-compose/insecure/mariadb-with-cron/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -12,6 +12,10 @@ services:
     env_file:
       - db.env
 
+  redis:
+    image: redis
+    restart: always
+
   app:  
     build: ./app
     restart: always
@@ -23,6 +27,7 @@ services:
       - db.env
     links:
       - db
+      - redis
 
   cron:
     build: ./app
@@ -31,6 +36,7 @@ services:
       - nextcloud:/var/www/html
     links:
       - db
+      - redis
     user: www-data
     entrypoint: |
       bash -c 'bash -s <<EOF
diff --git a/.examples/docker-compose/insecure/mariadb-with-cron/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-with-cron/apache/app/Dockerfile
deleted file mode 100644
index 8c03a7c8..00000000
--- a/.examples/docker-compose/insecure/mariadb-with-cron/apache/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:apache
-
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
diff --git a/.examples/docker-compose/insecure/mariadb-with-redis/apache/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb-with-redis/apache/app/autoconfig.php
deleted file mode 100644
index ea7004e9..00000000
--- a/.examples/docker-compose/insecure/mariadb-with-redis/apache/app/autoconfig.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$AUTOCONFIG = array(
-  'directory'     => '/var/www/html/data',
-  'dbtype'        => 'mysql',
-  'dbname'        => getenv('MYSQL_DATABASE'),
-  'dbuser'        => getenv('MYSQL_USER'),
-  'dbpass'        => getenv('MYSQL_PASSWORD'),
-  'dbhost'        => 'db',
-  'dbtableprefix' => '',
-);
diff --git a/.examples/docker-compose/insecure/mariadb-with-redis/apache/db.env b/.examples/docker-compose/insecure/mariadb-with-redis/apache/db.env
deleted file mode 100644
index a4366057..00000000
--- a/.examples/docker-compose/insecure/mariadb-with-redis/apache/db.env
+++ /dev/null
@@ -1,3 +0,0 @@
-MYSQL_PASSWORD=
-MYSQL_DATABASE=nextcloud
-MYSQL_USER=nextcloud
diff --git a/.examples/docker-compose/insecure/mariadb-with-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-with-redis/apache/docker-compose.yml
deleted file mode 100644
index faf117ad..00000000
--- a/.examples/docker-compose/insecure/mariadb-with-redis/apache/docker-compose.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: '3'
-
-services:
-  db:
-    image: mariadb
-    # image: mysql
-    restart: always
-    volumes:
-      - db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=
-    env_file:
-      - db.env
-
-  redis:
-    image: redis
-    restart: always
-
-  app:  
-    build: ./app
-    restart: always
-    ports:
-      - 8080:80
-    volumes:
-      - nextcloud:/var/www/html
-    env_file:
-      - db.env
-    links:
-      - db
-      - redis
-
-volumes:
-  db:
-  nextcloud: