From 413a57a781d58921d130933c50bcb7b06bba86da Mon Sep 17 00:00:00 2001 From: bkraul Date: Tue, 6 Oct 2020 15:27:34 -0500 Subject: [PATCH] Added def for nc 20 --- fpm-alpine/20/Dockerfile | 21 +++++++++++++++++++ fpm-alpine/20/build | 6 ++++++ fpm-alpine/20/push | 4 ++++ fpm-alpine/20/redis.config.php | 8 +++++++ fpm/18/Dockerfile | 4 ++-- fpm/20/Dockerfile | 38 ++++++++++++++++++++++++++++++++++ fpm/20/build | 6 ++++++ fpm/20/push | 4 ++++ fpm/20/redis.config.php | 8 +++++++ 9 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 fpm-alpine/20/Dockerfile create mode 100755 fpm-alpine/20/build create mode 100755 fpm-alpine/20/push create mode 100644 fpm-alpine/20/redis.config.php create mode 100644 fpm/20/Dockerfile create mode 100755 fpm/20/build create mode 100755 fpm/20/push create mode 100644 fpm/20/redis.config.php diff --git a/fpm-alpine/20/Dockerfile b/fpm-alpine/20/Dockerfile new file mode 100644 index 0000000..83a32ef --- /dev/null +++ b/fpm-alpine/20/Dockerfile @@ -0,0 +1,21 @@ +FROM nextcloud:20-fpm-alpine + +RUN set -ex; \ + apk add --no-cache --virtual .build-deps \ + autoconf \ + automake \ + file \ + g++ \ + gcc \ + make \ + php7-dev \ + re2c \ + samba-dev \ + zlib-dev; \ + apk add --no-cache libsmbclient; \ + pecl install smbclient; \ + docker-php-ext-enable smbclient; \ + apk add --no-cache imagemagick; \ + apk del .build-deps + +COPY redis.config.php /usr/src/nextcloud/config/redis.config.php diff --git a/fpm-alpine/20/build b/fpm-alpine/20/build new file mode 100755 index 0000000..96ff400 --- /dev/null +++ b/fpm-alpine/20/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull nextcloud:20-fpm-alpine +docker build $1\ + -t bkraul/nextcloud:20-fpm-alpine \ + . diff --git a/fpm-alpine/20/push b/fpm-alpine/20/push new file mode 100755 index 0000000..fa128e9 --- /dev/null +++ b/fpm-alpine/20/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/nextcloud:20-fpm-alpine + diff --git a/fpm-alpine/20/redis.config.php b/fpm-alpine/20/redis.config.php new file mode 100644 index 0000000..b0cebe3 --- /dev/null +++ b/fpm-alpine/20/redis.config.php @@ -0,0 +1,8 @@ + '\OC\Memcache\Redis', + 'redis' => array( + 'host' => 'redis', + 'port' => 6379, + ), +); diff --git a/fpm/18/Dockerfile b/fpm/18/Dockerfile index d1d6cf8..8b7e9da 100644 --- a/fpm/18/Dockerfile +++ b/fpm/18/Dockerfile @@ -17,8 +17,8 @@ RUN set -ex; \ RUN set -ex; \ savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y libsmbclient-dev; \ + apt-get --allow-unauthenticated update; \ + apt-get --allow-unauthenticated 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 diff --git a/fpm/20/Dockerfile b/fpm/20/Dockerfile new file mode 100644 index 0000000..95120bf --- /dev/null +++ b/fpm/20/Dockerfile @@ -0,0 +1,38 @@ +FROM nextcloud:20-fpm + +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/20/build b/fpm/20/build new file mode 100755 index 0000000..d188083 --- /dev/null +++ b/fpm/20/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull nextcloud:20-fpm +docker build $1\ + -t bkraul/nextcloud:20-fpm \ + . diff --git a/fpm/20/push b/fpm/20/push new file mode 100755 index 0000000..52b6ae9 --- /dev/null +++ b/fpm/20/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/nextcloud:20-fpm + diff --git a/fpm/20/redis.config.php b/fpm/20/redis.config.php new file mode 100644 index 0000000..b0cebe3 --- /dev/null +++ b/fpm/20/redis.config.php @@ -0,0 +1,8 @@ + '\OC\Memcache\Redis', + 'redis' => array( + 'host' => 'redis', + 'port' => 6379, + ), +);