merge from master

.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile

@@ -1,3 +0,0 @@
-FROM nextcloud:apache
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php

@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.locking' => '\OC\Memcache\Redis',
-  'redis' => array(
-    'host' => 'redis',
-    'port' => 6379,
-  ),
-);

.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
@@ -25,6 +25,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - MYSQL_HOST=db
+      - REDIS_HOST=redis
     env_file:
       - db.env
     depends_on:
@@ -32,7 +33,7 @@ services:
       - redis
 
   cron:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html

.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile

@@ -1,3 +0,0 @@
-FROM nextcloud:fpm-alpine
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php

@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.locking' => '\OC\Memcache\Redis',
-  'redis' => array(
-    'host' => 'redis',
-    'port' => 6379,
-  ),
-);

.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml

@@ -17,12 +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
     env_file:
       - db.env
     depends_on:
@@ -40,7 +41,7 @@ services:
       - app
 
   cron:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -120,7 +120,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -120,7 +120,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/insecure/postgres/apache/db.env

@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres

.examples/docker-compose/insecure/postgres/apache/docker-compose.yml

@@ -18,6 +18,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:

.examples/docker-compose/insecure/postgres/fpm/db.env

@@ -1,3 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres

.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml

@@ -16,6 +16,7 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
+      - POSTGRES_DB=nextcloud
     env_file:
       - db.env
     depends_on:

.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -120,7 +120,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/proxy/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -125,7 +125,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/Dockerfile

@@ -1,3 +0,0 @@
-FROM nextcloud:apache
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php

@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.locking' => '\OC\Memcache\Redis',
-  'redis' => array(
-    'host' => 'redis',
-    'port' => 6379,
-  ),
-);

.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
@@ -26,6 +26,7 @@ services:
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
       - MYSQL_HOST=db
+      - REDIS_HOST=redis
     env_file:
       - db.env
     depends_on:
@@ -36,7 +37,7 @@ services:
       - default
 
   cron:
-    build: ./app
+    image: nextcloud:apache
     restart: always
     volumes:
       - nextcloud:/var/www/html

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/proxy/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile

@@ -1,3 +0,0 @@
-FROM nextcloud:fpm-alpine
-
-COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php

@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.locking' => '\OC\Memcache\Redis',
-  'redis' => array(
-    'host' => 'redis',
-    'port' => 6379,
-  ),
-);

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml

@@ -17,12 +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
     env_file:
       - db.env
     depends_on:
@@ -45,7 +46,7 @@ services:
       - default
 
   cron:
-    build: ./app
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/proxy/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -125,7 +125,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/with-nginx-proxy/mariadb/apache/configs/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -125,7 +125,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/postgres/apache/configs/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env

@@ -1,2 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres

.examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  1;
+worker_processes auto;
 
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
@@ -125,7 +125,7 @@ http {
 
         # Adding the cache control header for js and css files
         # Make sure it is BELOW the PHP block
-        location ~ \.(?:css|js|woff|svg|gif)$ {
+        location ~ \.(?:css|js|woff2?|svg|gif)$ {
             try_files $uri /index.php$request_uri;
             add_header Cache-Control "public, max-age=15778463";
             # Add headers to serve security related headers (It is intended to

.examples/docker-compose/with-nginx-proxy/postgres/fpm/configs/uploadsize.conf

@@ -1 +1,2 @@
 client_max_body_size 10G;
+proxy_request_buffering off;

.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env

@@ -1,2 +1,2 @@
 POSTGRES_PASSWORD=
-POSTGRES_USER=nextcloud
+POSTGRES_USER=postgres