nextcloud: fix, php 7.1, remove redis

2025-07-01 14:45:38 +00:00 · 2017-02-15 17:36:36 +01:00
parent e3c4fa505b
commit c482784782
45 changed files with 128 additions and 1074 deletions
--- a/nextcloud/daily/Dockerfile
+++ b/nextcloud/daily/Dockerfile
@ -1,29 +1,30 @@
 FROM alpine:edge
-MAINTAINER Wonderfall <wonderfall@schrodinger.io>

 ARG GNU_LIBICONV_VERSION=1.14
+ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

 ENV UID=991 GID=991 \
    UPLOAD_MAX_SIZE=10G \
    APC_SHM_SIZE=128M \
    OPCACHE_MEM_SIZE=128 \
-    REDIS_MAX_MEMORY=64mb \
    CRON_PERIOD=15m \
+    CRON_MEMORY_LIMIT=1g \
    TZ=Etc/UTC \
    DB_TYPE=sqlite3 \
    ADMIN_USER=admin \
    ADMIN_PASSWORD=admin

-RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
 && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
 && BUILD_DEPS=" \
+    gnupg \
    tar \
    build-base \
    autoconf \
    automake \
    libtool \
    samba-dev" \
- && apk -U add \
+ && apk -U upgrade && apk add \
    ${BUILD_DEPS} \
    nginx \
    s6 \
@ -33,62 +34,60 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
    samba-client \
    su-exec \
    tzdata \
-    redis \
-    php7@commuedge \
-    php7-fpm@commuedge \
-    php7-intl@commuedge \
-    php7-mbstring@commuedge \
-    php7-curl@commuedge \
-    php7-gd@commuedge \
-    php7-mcrypt@commuedge \
-    php7-opcache@commuedge \
-    php7-json@commuedge \
-    php7-session@commuedge \
-    php7-pdo@commuedge \
-    php7-dom@commuedge \
-    php7-ctype@commuedge \
-    php7-pdo_mysql@commuedge \
-    php7-pdo_pgsql@commuedge \
-    php7-pgsql@commuedge \
-    php7-pdo_sqlite@commuedge \
-    php7-sqlite3@commuedge \
-    php7-zlib@commuedge \
-    php7-zip@commuedge \
-    php7-xmlreader@commuedge \
-    php7-posix@commuedge \
-    php7-openssl@commuedge \
-    php7-ldap@commuedge \
-    php7-ftp@commuedge \
-    php7-pcntl@commuedge \
-    php7-exif@commuedge \
-    php7-apcu@testing \
-    php7-redis@testing \
-    php7-pear@commuedge \
-    php7-dev@commuedge \
- && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install smbclient \
+    php7.1@testing \
+    php7.1-fpm@testing \
+    php7.1-intl@testing \
+    php7.1-mbstring@testing \
+    php7.1-curl@testing \
+    php7.1-gd@testing \
+    php7.1-mcrypt@testing \
+    php7.1-opcache@testing \
+    php7.1-json@testing \
+    php7.1-session@testing \
+    php7.1-pdo@testing \
+    php7.1-dom@testing \
+    php7.1-ctype@testing \
+    php7.1-pdo_mysql@testing \
+    php7.1-pdo_pgsql@testing \
+    php7.1-pgsql@testing \
+    php7.1-pdo_sqlite@testing \
+    php7.1-sqlite3@testing \
+    php7.1-zlib@testing \
+    php7.1-zip@testing \
+    php7.1-xmlreader@testing \
+    php7.1-xml@testing \
+    php7.1-xmlwriter@testing \
+    php7.1-posix@testing \
+    php7.1-openssl@testing \
+    php7.1-ldap@testing \
+    php7.1-ftp@testing \
+    php7.1-pcntl@testing \
+    php7.1-exif@testing \
+    php7.1-pear@testing \
+    php7.1-dev@testing \
+ && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install smbclient apcu \
 && cd /tmp && wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${GNU_LIBICONV_VERSION}.tar.gz \
 && tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \
 && ./configure --prefix=/usr/local \
 && wget -q https://raw.githubusercontent.com/mxe/mxe/7e231efd245996b886b501dad780761205ecf376/src/libiconv-1-fixes.patch \
 && patch -p1 -u < libiconv-1-fixes.patch \
 && make && make install && libtool --finish /usr/local/lib && cd /tmp \
- && wget -q http://is1.php.net/get/php-7.0.13.tar.gz/from/this/mirror -O php7.tar.gz \
- && tar xzf php7.tar.gz && cd /tmp/php-7.0.13/ext/iconv && phpize7 \
- && ./configure --with-iconv=/usr/local --with-php-config=/usr/bin/php-config7 \
- && make && cp modules/iconv.so /usr/lib/php7/modules && cd /tmp \
- && echo "extension=iconv.so" > /etc/php7/conf.d/00_iconv.ini \
- && echo "extension=smbclient.so" > /etc/php7/conf.d/00_smbclient.ini \
+ && wget -q http://is1.php.net/get/php-7.1.1.tar.gz/from/this/mirror -O php7.1.tar.gz \
+ && tar xzf php7.1.tar.gz && cd /tmp/php-7.1.1/ext/iconv && phpize7.1 \
+ && ./configure --with-iconv=/usr/local --with-php-config=/usr/bin/php-config7.1 \
+ && make && cp modules/iconv.so /usr/lib/php7.1/modules && cd /tmp \
+ && echo "extension=iconv.so" > /etc/php7.1/conf.d/00_iconv.ini \
+ && echo "extension=smbclient.so" > /etc/php7.1/conf.d/00_smbclient.ini \
 && mkdir /nextcloud \
 && wget -q https://download.nextcloud.com/server/daily/latest.tar.bz2 \
 && tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \
- && apk del ${BUILD_DEPS} php7-pear php7-dev \
- && rm -rf /var/cache/apk/* /tmp/*
+ && apk del ${BUILD_DEPS} php7.1-pear php7.1-dev \
+ && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg

 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7/php-fpm.conf
-COPY opcache.ini /etc/php7/conf.d/00_opcache.ini
-COPY apcu.ini /etc/php7/conf.d/apcu.ini
-COPY redis.conf /etc/redis.conf
+COPY php-fpm.conf /etc/php7.1/php-fpm.conf
+COPY opcache.ini /etc/php7.1/conf.d/00_opcache.ini
+COPY apcu.ini /etc/php7.1/conf.d/apcu.ini
 COPY run.sh /usr/local/bin/run.sh
 COPY setup.sh /usr/local/bin/setup.sh
 COPY occ /usr/local/bin/occ
@ -96,11 +95,12 @@ COPY s6.d /etc/s6.d

 RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*

-VOLUME /data /config /apps2 /var/lib/redis
+VOLUME /data /config /apps2

 EXPOSE 8888

 LABEL description="A server software for creating file hosting services" \
-      nextcloud="Nextcloud daily build"
+      nextcloud="Nextcloud daily" \
+      maintainer="Wonderfall <wonderfall@targaryen.house>"

 CMD ["run.sh"]
--- a/nextcloud/daily/occ
+++ b/nextcloud/daily/occ
@ -1,2 +1,2 @@
 #!/bin/sh
-su-exec $UID:$GID php7 /nextcloud/occ $@
+su-exec $UID:$GID php7.1 /nextcloud/occ $@
--- a/nextcloud/daily/redis.conf
+++ b/nextcloud/daily/redis.conf
@ -1,14 +0,0 @@
-bind 127.0.0.1
-protected-mode yes
-port 0
-unixsocket /tmp/redis.sock
-unixsocketperm 700
-daemonize no
-pidfile /tmp/redis.pid
-logfile /tmp/redis.log
-save 900 1
-save 300 10
-save 60 10000
-dbfilename dump.rdb
-dir /var/lib/redis/
-maxmemory <REDIS_MAX_MEMORY>
--- a/nextcloud/daily/run.sh
+++ b/nextcloud/daily/run.sh
@ -1,20 +1,27 @@
 #!/bin/sh

-sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/php7/php-fpm.conf \
-       -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /etc/php7/conf.d/apcu.ini \
-       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
-       -e "s/<REDIS_MAX_MEMORY>/$REDIS_MAX_MEMORY/g" /etc/redis.conf \
+sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/php7.1/php-fpm.conf \
+       -e "s/<APC_SHM_SIZE>/$APC_SHM_SIZE/g" /etc/php7.1/conf.d/apcu.ini \
+       -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7.1/conf.d/00_opcache.ini \
+       -e "s/<CRON_MEMORY_LIMIT>/$CRON_MEMORY_LIMIT/g" /etc/s6.d/cron/run \
       -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run

 # Put the configuration and apps into volumes
 ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
 ln -sf /apps2 /nextcloud &>/dev/null

-for dir in /nextcloud /data /config /apps2 /etc/nginx /etc/php7 /var/log /var/lib/nginx /var/lib/redis /tmp /etc/s6.d; do
+mv nextcloud fix && mv fix nextcloud # fix strange bug
+
+echo "Updating permissions..."
+for dir in /nextcloud /data /config /apps2 /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d; do
  if $(find $dir ! -user $UID -o ! -group $GID|egrep '.' -q); then
+    echo "Updating permissions in $dir..."
    chown -R $UID:$GID $dir
+  else
+    echo "Permissions in $dir are correct."
  fi
 done
+echo "Done updating permissions."

 if [ ! -f /config/config.php ]; then
    # New installation, run the setup
--- a/nextcloud/daily/s6.d/cron/run
+++ b/nextcloud/daily/s6.d/cron/run
@ -1,6 +1,6 @@
 #!/bin/sh

 while true; do
-  php7 -f /nextcloud/cron.php
+  php7.1 -d memory_limit=<CRON_MEMORY_LIMIT> -f /nextcloud/cron.php
  sleep <CRON_PERIOD>
 done
--- a/nextcloud/daily/s6.d/php/run
+++ b/nextcloud/daily/s6.d/php/run
@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7
+exec php-fpm7.1
--- a/nextcloud/daily/s6.d/redis/run
+++ b/nextcloud/daily/s6.d/redis/run
@ -1,2 +0,0 @@
-#!/bin/sh
-exec redis-server /etc/redis.conf
--- a/nextcloud/daily/setup.sh
+++ b/nextcloud/daily/setup.sh
@ -29,13 +29,6 @@ cat > $CONFIGFILE <<EOF;

  'memcache.local' => '\OC\Memcache\APCu',

-  'memcache.locking' => '\OC\Memcache\Redis',
-   'redis' => array(
-        'host' => '/tmp/redis.sock',
-        'port' => 0,
-        'timeout' => 0.0,
-         ),
-
  'instanceid' => '$instanceid',
 );
 ?>
@ -74,7 +67,7 @@ echo "Starting automatic configuration..."
 # Execute ownCloud's setup step, which creates the ownCloud database.
 # It also wipes it if it exists. And it updates config.php with database
 # settings and deletes the autoconfig.php file.
-(cd /nextcloud; php7 index.php)
+(cd /nextcloud; php7.1 index.php)
 echo "Automatic configuration finished."

 # Update config.php.
@ -88,7 +81,7 @@ echo "Automatic configuration finished."
 # Use PHP to read the settings file, modify it, and write out the new settings array.

 CONFIG_TEMP=$(/bin/mktemp)
-php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
+php7.1 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
 <?php
 include("/config/config.php");