Merge 4df45e7ac3 into 645f515e29

.examples/docker-compose/insecure/mariadb/apache/compose.yaml

@@ -1,9 +1,6 @@
 services:
-  # Note: MariaDB is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -15,8 +12,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always

.examples/docker-compose/insecure/mariadb/fpm/compose.yaml

@@ -1,9 +1,6 @@
 services:
-  # Note: MariaDB is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -15,8 +12,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -36,18 +31,14 @@ services:
       - db
       - redis
 
-  # Note: Nginx is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx:alpine-slim
+    build: ./web
     restart: always
     ports:
       - 127.0.0.1:8080:80
     volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
-      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
-      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
+      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     depends_on:
       - app
 

.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf

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

@@ -1,8 +1,5 @@
 services:
-  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/postgres
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -10,8 +7,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always

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

@@ -1,8 +1,5 @@
 services:
-  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/postgres
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -10,8 +7,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -31,18 +26,14 @@ services:
       - db
       - redis
 
-  # Note: Nginx is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx:alpine-slim
+    build: ./web
     restart: always
     ports:
       - 127.0.0.1:8080:80
     volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
-      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
-      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
+      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     depends_on:
       - app
 

.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf

.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml

@@ -1,9 +1,6 @@
 services:
-  # Note: MariaDB is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -15,8 +12,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -38,6 +33,9 @@ services:
     depends_on:
       - db
       - redis
+      # Added proxy container dependency below. 
+      # It is unclear on when or why it happens, but sometimes NC manages to start before the proxy 
+      #  and it breaks for whatever weird reason resulting in the need of manual proxy container restart.
       - proxy
     networks:
       - proxy-tier
@@ -54,9 +52,6 @@ services:
       - db
       - redis
 
-  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
-  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
-  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -74,8 +69,6 @@ services:
     networks:
       - proxy-tier
 
-  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -92,7 +85,7 @@ services:
     depends_on:
       - proxy
 
-# self signed,outdated
+# self signed
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"

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

@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:1.7-alpine
+FROM nginxproxy/nginx-proxy:alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml

@@ -1,9 +1,6 @@
 services:
-  # Note: MariaDB is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -15,8 +12,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -37,16 +32,12 @@ services:
       - redis
       - proxy
 
-  # Note: Nginx is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx:alpine-slim
+    build: ./web
     restart: always
     volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
-      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
-      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
+      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -68,9 +59,6 @@ services:
       - db
       - redis
 
-  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
-  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
-  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -87,8 +75,6 @@ services:
     networks:
       - proxy-tier
 
-  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -105,7 +91,7 @@ services:
     depends_on:
       - proxy
 
-# self signed, outdated. 
+# self signed
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"

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

@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:1.7-alpine
+FROM nginxproxy/nginx-proxy:alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf

.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml

@@ -1,8 +1,5 @@
 services:
-  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/postgres
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -10,8 +7,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -49,9 +44,6 @@ services:
       - db
       - redis
 
-  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
-  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
-  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -68,8 +60,6 @@ services:
     networks:
       - proxy-tier
 
-  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -84,7 +74,7 @@ services:
     depends_on:
       - proxy
 
-# self signed, outdated
+# self signed
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"

.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile

@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:1.7-alpine
+FROM nginxproxy/nginx-proxy:alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml

@@ -1,8 +1,7 @@
+version: '3'
+
 services:
-  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/postgres
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -10,8 +9,6 @@ services:
     env_file:
       - db.env
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -32,16 +29,12 @@ services:
       - redis
       - proxy
 
-  # Note: Nginx is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx:alpine-slim
+    build: ./web
     restart: always
     volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
-      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro
-      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
+      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -63,9 +56,6 @@ services:
       - db
       - redis
 
-  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
-  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
-  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -82,8 +72,6 @@ services:
     networks:
       - proxy-tier
 
-  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -100,7 +88,7 @@ services:
     depends_on:
       - proxy
 
-# self signed, outdated
+# self signed
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"

.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile

@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:1.7-alpine
+FROM nginxproxy/nginx-proxy:alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf

README.md

@@ -82,7 +82,7 @@ Database:
 ```console
 $ docker run -d \
 -v db:/var/lib/mysql \
-mariadb:lts
+mariadb:10.11
 ```
 
 ### Additional volumes
@@ -415,11 +415,8 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia
 
 ```yaml
 services:
-  # Note: MariaDB is external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     restart: always
     command: --transaction-isolation=READ-COMMITTED
     volumes:
@@ -430,8 +427,6 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -468,11 +463,8 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia
 
 ```yaml
 services:
-  # Note: MariaDB is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/mariadb
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:10.11
-    image: mariadb:lts
     restart: always
     command: --transaction-isolation=READ-COMMITTED
     volumes:
@@ -483,8 +475,6 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
 
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -503,17 +493,14 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
 
-  # Note: Nginx is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx:alpine-slim
+    image: nginx
     restart: always
     ports:
       - 8080:80
     depends_on:
       - app
     volumes:
-      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
     volumes_from:
       - app
@@ -539,11 +526,8 @@ Example:
 
 ```yaml
 services:
-  # Note: PostgreSQL is external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/postgres
   db:
-    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: postgres
-    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
@@ -555,8 +539,6 @@ services:
       - postgres_db
       - postgres_password
       - postgres_user
-  # Note: Redis is an external service. You can find more information about the configuration here:
-  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always