Added support for fpm (debian buster)

fpm-alpine/16/push-local

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-docker push docker-registry.belmankraul.com/bkraul/nextcloud:latest 
-docker push docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine
-

fpm-alpine/16/tag-local

@@ -1,2 +0,0 @@
-docker tag bkraul/nextcloud:latest docker-registry.belmankraul.com/bkraul/nextcloud:latest
-docker tag bkraul/nextcloud:fpm-alpine docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine

fpm-alpine/17/Dockerfile

@@ -12,7 +12,7 @@ RUN set -ex; \
 	re2c \
 	samba-dev \
 	zlib-dev; \
- apk add --no-cache libsmbclient; \	
+ apk add --no-cache libsmbclient;  \	
  pecl install smbclient; \
  docker-php-ext-enable smbclient; \ 
  apk add --no-cache imagemagick; \ 

fpm-alpine/17/build

@@ -2,7 +2,5 @@
 
 docker pull nextcloud:17-fpm-alpine
 docker build $1\
-  -t bkraul/nextcloud:latest \
-  -t bkraul/nextcloud:fpm-alpine \
   -t bkraul/nextcloud:17-fpm-alpine \
   .

fpm-alpine/17/push

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-docker push bkraul/nextcloud:latest
-docker push bkraul/nextcloud:fpm-alpine
 docker push bkraul/nextcloud:17-fpm-alpine
 

fpm-alpine/17/push-local

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-docker push docker-registry.belmankraul.com/bkraul/nextcloud:latest 
-docker push docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine
-

fpm-alpine/17/tag-local

@@ -1,2 +0,0 @@
-docker tag bkraul/nextcloud:latest docker-registry.belmankraul.com/bkraul/nextcloud:latest
-docker tag bkraul/nextcloud:fpm-alpine docker-registry.belmankraul.com/bkraul/nextcloud:fpm-alpine

fpm/16/Dockerfile

@@ -0,0 +1,39 @@
+FROM nextcloud:16-fpm
+MAINTAINER Belman Kraul <bkraul@belmankraul.com>
+
+RUN set -ex \
+  usermod -u 82 www-data; \
+  groupmod -g 82 www-data; \
+  usermod -g 82 www-data; \
+  # for some reason this needs to be repeated.
+  usermod -u 82 www-data; \  
+  chown -R www-data:root /var/www; \
+  chmod -R g=u /var/www  
+
+RUN set -ex; \
+  apt-get update; \
+  apt-get install -y \
+    libmagickcore-6.q16-3-extra; \
+  rm -rf /var/lib/apt/lists/*;
+
+RUN set -ex; \
+  savedAptMark="$(apt-mark showmanual)"; \  
+  apt-get update; \
+  apt-get install -y libsmbclient-dev; \
+  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/*
+
+COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

fpm/16/build

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker pull nextcloud:16-fpm
+docker build $1\
+  -t bkraul/nextcloud:16-fpm \
+  .

fpm/16/push

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker push bkraul/nextcloud:16-fpm
+

fpm/16/redis.config.php

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

fpm/17/Dockerfile

@@ -0,0 +1,39 @@
+FROM nextcloud:17-fpm
+MAINTAINER Belman Kraul <bkraul@belmankraul.com>
+
+RUN set -ex \
+  usermod -u 82 www-data; \
+  groupmod -g 82 www-data; \
+  usermod -g 82 www-data; \
+  # for some reason this needs to be repeated.
+  usermod -u 82 www-data; \  
+  chown -R www-data:root /var/www; \
+  chmod -R g=u /var/www  
+
+RUN set -ex; \
+  apt-get update; \
+  apt-get install -y \
+    libmagickcore-6.q16-3-extra; \
+  rm -rf /var/lib/apt/lists/*;
+
+RUN set -ex; \
+  savedAptMark="$(apt-mark showmanual)"; \  
+  apt-get update; \
+  apt-get install -y libsmbclient-dev; \
+  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/*
+
+COPY redis.config.php /usr/src/nextcloud/config/redis.config.php

fpm/17/build

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+docker pull nextcloud:17-fpm
+docker build $1 \
+  -t bkraul/nextcloud:17-fpm \
+  .

fpm/17/push

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker push bkraul/nextcloud:17-fpm
+

fpm/17/redis.config.php

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