Browse Source

Added def for nc 20

master
bkraul 1 month ago
parent
commit
413a57a781
9 changed files with 97 additions and 2 deletions
  1. + 21
    - 0
      fpm-alpine/20/Dockerfile
  2. + 6
    - 0
      fpm-alpine/20/build
  3. + 4
    - 0
      fpm-alpine/20/push
  4. + 8
    - 0
      fpm-alpine/20/redis.config.php
  5. + 2
    - 2
      fpm/18/Dockerfile
  6. + 38
    - 0
      fpm/20/Dockerfile
  7. + 6
    - 0
      fpm/20/build
  8. + 4
    - 0
      fpm/20/push
  9. + 8
    - 0
      fpm/20/redis.config.php

+ 21
- 0
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

+ 6
- 0
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 \
.

+ 4
- 0
fpm-alpine/20/push

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

+ 8
- 0
fpm-alpine/20/redis.config.php

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

+ 2
- 2
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

+ 38
- 0
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

+ 6
- 0
fpm/20/build

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

+ 4
- 0
fpm/20/push

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

+ 8
- 0
fpm/20/redis.config.php

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

Loading…
Cancel
Save