From 5871baee0bac9603c8646bae626a255fc1a0a8ec Mon Sep 17 00:00:00 2001 From: bkraul Date: Wed, 27 Nov 2019 12:38:45 -0600 Subject: [PATCH] Added support for fpm (debian buster) --- fpm-alpine/16/push-local | 5 ----- fpm-alpine/16/tag-local | 2 -- fpm-alpine/17/Dockerfile | 2 +- fpm-alpine/17/build | 2 -- fpm-alpine/17/push | 2 -- fpm-alpine/17/push-local | 5 ----- fpm-alpine/17/tag-local | 2 -- fpm/16/Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++ fpm/16/build | 6 ++++++ fpm/16/push | 4 ++++ fpm/16/redis.config.php | 8 ++++++++ fpm/17/Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++ fpm/17/build | 6 ++++++ fpm/17/push | 4 ++++ fpm/17/redis.config.php | 8 ++++++++ 15 files changed, 115 insertions(+), 19 deletions(-) delete mode 100755 fpm-alpine/16/push-local delete mode 100755 fpm-alpine/16/tag-local delete mode 100755 fpm-alpine/17/push-local delete mode 100755 fpm-alpine/17/tag-local create mode 100644 fpm/16/Dockerfile create mode 100755 fpm/16/build create mode 100755 fpm/16/push create mode 100644 fpm/16/redis.config.php create mode 100644 fpm/17/Dockerfile create mode 100755 fpm/17/build create mode 100755 fpm/17/push create mode 100644 fpm/17/redis.config.php diff --git a/fpm-alpine/16/push-local b/fpm-alpine/16/push-local deleted file mode 100755 index 6d77042..0000000 --- a/fpm-alpine/16/push-local +++ /dev/null @@ -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 - diff --git a/fpm-alpine/16/tag-local b/fpm-alpine/16/tag-local deleted file mode 100755 index f159b9d..0000000 --- a/fpm-alpine/16/tag-local +++ /dev/null @@ -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 diff --git a/fpm-alpine/17/Dockerfile b/fpm-alpine/17/Dockerfile index feec892..70e61bb 100644 --- a/fpm-alpine/17/Dockerfile +++ b/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; \ diff --git a/fpm-alpine/17/build b/fpm-alpine/17/build index 8e0d02e..cdd7303 100755 --- a/fpm-alpine/17/build +++ b/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 \ . diff --git a/fpm-alpine/17/push b/fpm-alpine/17/push index 852a4a4..9ea97f6 100755 --- a/fpm-alpine/17/push +++ b/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 diff --git a/fpm-alpine/17/push-local b/fpm-alpine/17/push-local deleted file mode 100755 index 6d77042..0000000 --- a/fpm-alpine/17/push-local +++ /dev/null @@ -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 - diff --git a/fpm-alpine/17/tag-local b/fpm-alpine/17/tag-local deleted file mode 100755 index f159b9d..0000000 --- a/fpm-alpine/17/tag-local +++ /dev/null @@ -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 diff --git a/fpm/16/Dockerfile b/fpm/16/Dockerfile new file mode 100644 index 0000000..fc6ff64 --- /dev/null +++ b/fpm/16/Dockerfile @@ -0,0 +1,39 @@ +FROM nextcloud:16-fpm +MAINTAINER Belman Kraul + +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 diff --git a/fpm/16/build b/fpm/16/build new file mode 100755 index 0000000..121e09d --- /dev/null +++ b/fpm/16/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull nextcloud:16-fpm +docker build $1\ + -t bkraul/nextcloud:16-fpm \ + . diff --git a/fpm/16/push b/fpm/16/push new file mode 100755 index 0000000..9d900e4 --- /dev/null +++ b/fpm/16/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/nextcloud:16-fpm + diff --git a/fpm/16/redis.config.php b/fpm/16/redis.config.php new file mode 100644 index 0000000..b0cebe3 --- /dev/null +++ b/fpm/16/redis.config.php @@ -0,0 +1,8 @@ + '\OC\Memcache\Redis', + 'redis' => array( + 'host' => 'redis', + 'port' => 6379, + ), +); diff --git a/fpm/17/Dockerfile b/fpm/17/Dockerfile new file mode 100644 index 0000000..a3e7271 --- /dev/null +++ b/fpm/17/Dockerfile @@ -0,0 +1,39 @@ +FROM nextcloud:17-fpm +MAINTAINER Belman Kraul + +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 diff --git a/fpm/17/build b/fpm/17/build new file mode 100755 index 0000000..b7b52d3 --- /dev/null +++ b/fpm/17/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull nextcloud:17-fpm +docker build $1 \ + -t bkraul/nextcloud:17-fpm \ + . diff --git a/fpm/17/push b/fpm/17/push new file mode 100755 index 0000000..2d83117 --- /dev/null +++ b/fpm/17/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/nextcloud:17-fpm + diff --git a/fpm/17/redis.config.php b/fpm/17/redis.config.php new file mode 100644 index 0000000..b0cebe3 --- /dev/null +++ b/fpm/17/redis.config.php @@ -0,0 +1,8 @@ + '\OC\Memcache\Redis', + 'redis' => array( + 'host' => 'redis', + 'port' => 6379, + ), +);