Merge pull request #639 from nextcloud/fix-examples

Remove app dockerfile

8 files changed, 9 insertions, 21 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
deleted file mode 100644
index b55fb524..00000000
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:apache
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
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 97c69299..600c609f 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
@@ -17,7 +17,7 @@ services:
     restart: always
 
   app:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     ports:
       - 8080:80
@@ -33,7 +33,7 @@ services:
       - redis
 
   cron:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
deleted file mode 100644
index 0436d37d..00000000
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm-alpine
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
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 b48e54f1..5ac5b3b1 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
@@ -17,7 +17,7 @@ services:
     restart: always
 
   app:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
@@ -41,7 +41,7 @@ services:
       - app
 
   cron:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
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
deleted file mode 100644
index b55fb524..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:apache
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
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 2c3f125e..39ab2bef 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
@@ -17,7 +17,7 @@ services:
     restart: always
 
   app:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html
@@ -37,7 +37,7 @@ services:
       - default
 
   cron:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html
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
deleted file mode 100644
index 0436d37d..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nextcloud:fpm-alpine
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
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 fd2e5fc1..d5763620 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
@@ -17,13 +17,13 @@ services:
     restart: always
 
   app:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
     environment:
       - MYSQL_HOST=db
-      - REDIS_HOST=redis 
+      - REDIS_HOST=redis
     env_file:
       - db.env
     depends_on:
@@ -46,7 +46,7 @@ services:
       - default
 
   cron:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html