From 0548adf1c1055e4d06fd9f219399215ea32e65c9 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Tue, 5 Sep 2017 23:41:20 +0200
Subject: [PATCH] Use autoconfig.php provided by the image

---
 .../insecure/mariadb-cron-redis/apache/app/Dockerfile  |  2 --
 .../mariadb-cron-redis/apache/app/autoconfig.php       | 10 ----------
 .../mariadb-cron-redis/apache/docker-compose.yml       |  2 ++
 .../insecure/mariadb-cron-redis/fpm/app/Dockerfile     |  2 --
 .../insecure/mariadb-cron-redis/fpm/app/autoconfig.php | 10 ----------
 .../insecure/mariadb-cron-redis/fpm/docker-compose.yml |  2 ++
 .../insecure/mariadb/apache/app/Dockerfile             |  3 ---
 .../insecure/mariadb/apache/app/autoconfig.php         | 10 ----------
 .../insecure/mariadb/apache/docker-compose.yml         |  4 +++-
 .../docker-compose/insecure/mariadb/fpm/app/Dockerfile |  3 ---
 .../insecure/mariadb/fpm/app/autoconfig.php            | 10 ----------
 .../insecure/mariadb/fpm/docker-compose.yml            |  4 +++-
 .../insecure/postgres/apache/app/Dockerfile            |  3 ---
 .../insecure/postgres/apache/app/autoconfig.php        | 10 ----------
 .../insecure/postgres/apache/docker-compose.yml        |  4 +++-
 .../insecure/postgres/fpm/app/Dockerfile               |  3 ---
 .../insecure/postgres/fpm/app/autoconfig.php           | 10 ----------
 .../insecure/postgres/fpm/docker-compose.yml           |  4 +++-
 .../mariadb-cron-redis/apache/app/Dockerfile           |  2 --
 .../mariadb-cron-redis/apache/app/autoconfig.php       | 10 ----------
 .../mariadb-cron-redis/apache/docker-compose.yml       |  2 ++
 .../mariadb-cron-redis/fpm/app/Dockerfile              |  2 --
 .../mariadb-cron-redis/fpm/app/autoconfig.php          | 10 ----------
 .../mariadb-cron-redis/fpm/docker-compose.yml          |  2 ++
 .../with-nginx-proxy/mariadb/apache/app/Dockerfile     |  3 ---
 .../with-nginx-proxy/mariadb/apache/app/autoconfig.php | 10 ----------
 .../with-nginx-proxy/mariadb/apache/docker-compose.yml |  4 +++-
 .../with-nginx-proxy/mariadb/fpm/app/Dockerfile        |  3 ---
 .../with-nginx-proxy/mariadb/fpm/app/autoconfig.php    | 10 ----------
 .../with-nginx-proxy/mariadb/fpm/docker-compose.yml    |  4 +++-
 .../with-nginx-proxy/postgres/apache/app/Dockerfile    |  3 ---
 .../postgres/apache/app/autoconfig.php                 | 10 ----------
 .../postgres/apache/docker-compose.yml                 |  4 +++-
 .../with-nginx-proxy/postgres/fpm/app/Dockerfile       |  3 ---
 .../with-nginx-proxy/postgres/fpm/app/autoconfig.php   | 10 ----------
 .../with-nginx-proxy/postgres/fpm/docker-compose.yml   |  4 +++-
 36 files changed, 32 insertions(+), 160 deletions(-)
 delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/mariadb/apache/app/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/mariadb/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/app/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/postgres/apache/app/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/postgres/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/insecure/postgres/fpm/app/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/postgres/fpm/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/app/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/apache/app/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/apache/app/autoconfig.php
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/app/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/app/autoconfig.php

diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
index 00598dd..b55fb52 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
@@ -1,5 +1,3 @@
 FROM nextcloud:apache
 
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
-
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/insecure/mariadb-cron-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-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 8b85c4d..87760d6 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
@@ -23,6 +23,8 @@ services:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
index f9a41f5..4a11161 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,5 +1,3 @@
 FROM nextcloud:fpm
 
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
-
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/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-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index d595531..f7b2447 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
@@ -21,6 +21,8 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/mariadb/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb/apache/app/Dockerfile
deleted file mode 100644
index 8c03a7c..0000000
--- a/.examples/docker-compose/insecure/mariadb/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/apache/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb/apache/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/insecure/mariadb/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/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
index 13a910f..4ea6775 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -13,12 +13,14 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:apache
     restart: always
     ports:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/app/Dockerfile
deleted file mode 100644
index d1d1f80..0000000
--- a/.examples/docker-compose/insecure/mariadb/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm
-
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/app/autoconfig.php b/.examples/docker-compose/insecure/mariadb/fpm/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/insecure/mariadb/fpm/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/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index e0c4a2e..dc3a8aa 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -13,10 +13,12 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:fpm
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/postgres/apache/app/Dockerfile b/.examples/docker-compose/insecure/postgres/apache/app/Dockerfile
deleted file mode 100644
index 8c03a7c..0000000
--- a/.examples/docker-compose/insecure/postgres/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/postgres/apache/app/autoconfig.php b/.examples/docker-compose/insecure/postgres/apache/app/autoconfig.php
deleted file mode 100644
index 3ac9f94..0000000
--- a/.examples/docker-compose/insecure/postgres/apache/app/autoconfig.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$AUTOCONFIG = array(
-  'directory'     => '/var/www/html/data',
-  'dbtype'        => 'pgsql',
-  'dbname'        => getenv('POSTGRES_DB'),
-  'dbuser'        => getenv('POSTGRES_USER'),
-  'dbpass'        => getenv('POSTGRES_PASSWORD'),
-  'dbhost'        => 'db',
-  'dbtableprefix' => '',
-);
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index 3043a59..8c4e8f4 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -10,12 +10,14 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:apache
     restart: always
     ports:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - POSTGRES_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/insecure/postgres/fpm/app/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/app/Dockerfile
deleted file mode 100644
index d1d1f80..0000000
--- a/.examples/docker-compose/insecure/postgres/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm
-
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
diff --git a/.examples/docker-compose/insecure/postgres/fpm/app/autoconfig.php b/.examples/docker-compose/insecure/postgres/fpm/app/autoconfig.php
deleted file mode 100644
index 3ac9f94..0000000
--- a/.examples/docker-compose/insecure/postgres/fpm/app/autoconfig.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$AUTOCONFIG = array(
-  'directory'     => '/var/www/html/data',
-  'dbtype'        => 'pgsql',
-  'dbname'        => getenv('POSTGRES_DB'),
-  'dbuser'        => getenv('POSTGRES_USER'),
-  'dbpass'        => getenv('POSTGRES_PASSWORD'),
-  'dbhost'        => 'db',
-  'dbtableprefix' => '',
-);
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 4df0a79..a64bfd5 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -10,10 +10,12 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:fpm
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - POSTGRES_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile
index 00598dd..b55fb52 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile
@@ -1,5 +1,3 @@
 FROM nextcloud:apache
 
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
-
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-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/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 80e3299..e01be64 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
@@ -25,6 +25,8 @@ services:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
index f9a41f5..4a11161 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,5 +1,3 @@
 FROM nextcloud:fpm
 
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
-
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/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/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 e1c3a17..8ed230a 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
@@ -21,6 +21,8 @@ services:
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/app/Dockerfile
deleted file mode 100644
index 8c03a7c..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/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/with-nginx-proxy/mariadb/apache/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/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/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index 264a9ed..8617cf5 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html
@@ -21,6 +21,8 @@ services:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/Dockerfile
deleted file mode 100644
index d1d1f80..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm
-
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/autoconfig.php
deleted file mode 100644
index ea7004e..0000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/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/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 35cdd33..7417a66 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -13,10 +13,12 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:fpm
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - MYSQL_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/apache/app/Dockerfile
deleted file mode 100644
index 8c03a7c..0000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/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/with-nginx-proxy/postgres/apache/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/postgres/apache/app/autoconfig.php
deleted file mode 100644
index 3ac9f94..0000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/app/autoconfig.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$AUTOCONFIG = array(
-  'directory'     => '/var/www/html/data',
-  'dbtype'        => 'pgsql',
-  'dbname'        => getenv('POSTGRES_DB'),
-  'dbuser'        => getenv('POSTGRES_USER'),
-  'dbpass'        => getenv('POSTGRES_PASSWORD'),
-  'dbhost'        => 'db',
-  'dbtableprefix' => '',
-);
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index c1a992d..f2b37cf 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html
@@ -18,6 +18,8 @@ services:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
+    environment:
+      - POSTGRES_HOST=db
     env_file:
       - db.env
     depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/Dockerfile
deleted file mode 100644
index d1d1f80..0000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm
-
-COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/autoconfig.php
deleted file mode 100644
index 3ac9f94..0000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/autoconfig.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$AUTOCONFIG = array(
-  'directory'     => '/var/www/html/data',
-  'dbtype'        => 'pgsql',
-  'dbname'        => getenv('POSTGRES_DB'),
-  'dbuser'        => getenv('POSTGRES_USER'),
-  'dbpass'        => getenv('POSTGRES_PASSWORD'),
-  'dbhost'        => 'db',
-  'dbtableprefix' => '',
-);
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 117f8e7..d929502 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -10,10 +10,12 @@ services:
       - db.env
 
   app:  
-    build: ./app
+    image: nextcloud:fpm
     restart: always
     volumes:
       - nextcloud:/var/www/html
+    environment:
+      - POSTGRES_HOST=db
     env_file:
       - db.env
     depends_on: