Added Redis memcache.distributed

.config/redis.config.php

@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+  $CONFIG = array (
+    'memcache.locking' => '\OC\Memcache\Redis',
+    'memcache.distributed' => '\OC\Memcache\Redis',
+    'redis' => array(
+      'host' => getenv('REDIS_HOST'),
+      'port' => getenv('REDIS_PORT') ?: 6379,
+    ),
+  );
+}
+

.examples/README.md

@@ -21,48 +21,43 @@ Example | Description
 ### full
 The `full` Dockerfile example adds dependencies for all optional packages suggested by nextcloud that may be needed for some features (e.g. Video Preview Generation), as stated in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html).
 
-NOTE: The Dockerfile does not install the LibreOffice package (line is commented), because it would increase the generated Image size by approximately 500 MB. In order to install it, simply uncomment the 13th line of the Dockerfile.  
+NOTE: The Dockerfile does not install the LibreOffice package (line is commented), because it would increase the generated Image size by approximately 500 MB. In order to install it, simply uncomment the appropriate line in the Dockerfile.
 
-NOTE: Per default, only previews for BMP, GIF, JPEG, MarkDown, MP3, PNG, TXT, and XBitmap Files are generated. The configuration of the preview generation can be done in config.php, as explained in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/config_sample_php_parameters.html#previews)  
+NOTE: Per default, only previews for BMP, GIF, JPEG, MarkDown, MP3, PNG, TXT, and XBitmap Files are generated. The configuration of the preview generation can be done in config.php, as explained in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/config_sample_php_parameters.html#previews)
 
-NOTE: Nextcloud recommends [disabling preview generation](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/harden_server.html?highlight=enabledpreviewproviders#disable-preview-image-generation) for high security deployments, as preview generation opens your nextcloud instance to new possible attack vectors.  
+NOTE: Nextcloud recommends [disabling preview generation](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/harden_server.html?highlight=enabledpreviewproviders#disable-preview-image-generation) for high security deployments, as preview generation opens your nextcloud instance to new possible attack vectors.
 
 The required steps for each optional/recommended package that is not already in the Nextcloud image are listed here, so that the Dockerfile can easily be modified to only install the needed extra packages. Simply remove the steps for the unwanted packages  from the Dockerfile.
 
 #### PHP Module bz2
-`docker-php-ext-install bz2`  
-
-#### PHP Module imagick
-`apt install libmagickwand-dev`  
-`pecl install imagick`  
-`docker-php-ext-enable imagick`  
+`docker-php-ext-install bz2`
 
 #### PHP Module imap
-`apt install libc-client-dev libkrb5-dev`  
-`docker-php-ext-configure imap --with-kerberos --with-imap-ssl`  
-`docker-php-ext-install imap`  
+`apt install libc-client-dev libkrb5-dev`
+`docker-php-ext-configure imap --with-kerberos --with-imap-ssl`
+`docker-php-ext-install imap`
 
 #### PHP Module gmp
-`apt install libgmp3-dev`  
-`docker-php-ext-install gmp`  
+`apt install libgmp3-dev`
+`docker-php-ext-install gmp`
 
 #### PHP Module smbclient
-`apt install smbclient libsmbclient-dev`  
-`pecl install smbclient`  
-`docker-php-ext-enable smbclient`  
+`apt install smbclient libsmbclient-dev`
+`pecl install smbclient`
+`docker-php-ext-enable smbclient`
 
 #### ffmpeg
-`apt install ffmpeg`  
+`apt install ffmpeg`
 
 #### LibreOffice
-`apt install libreoffice`  
+`apt install libreoffice`
 
 #### CRON via supervisor
-`apt install supervisor`  
-`mkdir /var/log/supervisord /var/run/supervisord`  
-The following Dockerfile commands are also necessary for a sucessfull cron installation:  
-`COPY supervisord.conf /etc/supervisor/supervisord.conf`  
-`CMD ["/usr/bin/supervisord"]`  
+`apt install supervisor`
+`mkdir /var/log/supervisord /var/run/supervisord`
+The following Dockerfile commands are also necessary for a sucessfull cron installation:
+`COPY supervisord.conf /etc/supervisor/supervisord.conf`
+`CMD ["/usr/bin/supervisord"]`
 
 
 

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:

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

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

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data

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

@@ -2,15 +2,15 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
     env_file:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:

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

@@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+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/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

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

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data

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

@@ -2,15 +2,15 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
     env_file:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html

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

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

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

@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;

.examples/dockerfiles/cron/fpm-alpine/Dockerfile

@@ -0,0 +1,10 @@
+FROM nextcloud:fpm-alpine
+
+RUN apk add --no-cache supervisor \
+  && mkdir /var/log/supervisord /var/run/supervisord
+
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]

.examples/dockerfiles/cron/fpm-alpine/supervisord.conf

@@ -0,0 +1,22 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisord/supervisord.log
+pidfile=/var/run/supervisord/supervisord.pid
+childlogdir=/var/log/supervisord/
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
+logfile_backups=10                              ; number of backed up logfiles
+loglevel=error
+
+[program:php-fpm]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php-fpm
+
+[program:cron]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=/cron.sh

.examples/dockerfiles/full/apache/Dockerfile

@@ -1,23 +1,58 @@
 FROM nextcloud:apache
 
-RUN mkdir -p /usr/share/man/man1 \
-    && apt-get update && apt-get install -y \
-        supervisor \
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
         ffmpeg \
-        libmagickwand-dev \
-        libgmp3-dev \
+        smbclient \
+        supervisor \
+#       libreoffice \
+    ; \
+    rm -rf /var/lib/apt/lists/*
+
+RUN set -ex; \
+    \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        libbz2-dev \
         libc-client-dev \
+        libgmp3-dev \
         libkrb5-dev \
-        smbclient \
         libsmbclient-dev \
-#       libreoffice \
-    && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
-    && docker-php-ext-install bz2 gmp imap \
-    && pecl install imagick smbclient \
-    && docker-php-ext-enable imagick smbclient \
-    && mkdir /var/log/supervisord /var/run/supervisord
+    ; \
+    \
+    docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
+    ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h; \
+    docker-php-ext-install \
+        bz2 \
+        gmp \
+        imap \
+    ; \
+    pecl install smbclient; \
+    docker-php-ext-enable smbclient; \
+    \
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+    apt-mark auto '.*' > /dev/null; \
+    apt-mark manual $savedAptMark; \
+    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+        | awk '/=>/ { print $3 }' \
+        | sort -u \
+        | xargs -r dpkg-query -S \
+        | cut -d: -f1 \
+        | sort -u \
+        | xargs -rt apt-mark manual; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p \
+    /usr/share/man/man1 \
+    /var/log/supervisord \
+    /var/run/supervisord \
+;
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf