summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2017-09-05 23:41:20 +0200
committerTilo Spannagel <development@tilosp.de>2017-09-27 13:29:15 +0200
commit0548adf1c1055e4d06fd9f219399215ea32e65c9 (patch)
treee4b419ad232ac9f92f2b5689b11746dde45e668d
parent4fbd273cb0a088b070a61411084ede9a80a9679b (diff)
Use autoconfig.php provided by the image
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile2
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/insecure/mariadb/apache/app/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/mariadb/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml4
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/app/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml4
-rw-r--r--.examples/docker-compose/insecure/postgres/apache/app/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/postgres/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/postgres/apache/docker-compose.yml4
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/app/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml2
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/apache/app/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/apache/app/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/apache/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml4
36 files changed, 32 insertions, 160 deletions
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 00598dd4..b55fb524 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 ea7004e9..00000000
--- 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 8b85c4dd..87760d6b 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 f9a41f56..4a111610 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 ea7004e9..00000000
--- 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 d595531e..f7b24473 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 8c03a7c8..00000000
--- 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 ea7004e9..00000000
--- 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 13a910fa..4ea67755 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 d1d1f807..00000000
--- 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 ea7004e9..00000000
--- 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 e0c4a2ee..dc3a8aaf 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 8c03a7c8..00000000
--- 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 3ac9f944..00000000
--- 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 3043a59f..8c4e8f4d 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 d1d1f807..00000000
--- 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 3ac9f944..00000000
--- 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 4df0a790..a64bfd5f 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 00598dd4..b55fb524 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 ea7004e9..00000000
--- 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 80e32998..e01be64e 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 f9a41f56..4a111610 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 ea7004e9..00000000
--- 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 e1c3a17e..8ed230ab 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 8c03a7c8..00000000
--- 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 ea7004e9..00000000
--- 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 264a9edb..8617cf50 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 d1d1f807..00000000
--- 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 ea7004e9..00000000
--- 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 35cdd33a..7417a665 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 8c03a7c8..00000000
--- 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 3ac9f944..00000000
--- 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 c1a992da..f2b37cf2 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 d1d1f807..00000000
--- 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 3ac9f944..00000000
--- 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 117f8e7b..d929502b 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: