diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile index e5fa59b..441448c 100644 --- a/nextcloud/11.0/Dockerfile +++ b/nextcloud/11.0/Dockerfile @@ -40,7 +40,6 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r php7.1-mbstring@testing \ php7.1-curl@testing \ php7.1-gd@testing \ - php7.1-fileinfo@testing \ php7.1-mcrypt@testing \ php7.1-opcache@testing \ php7.1-json@testing \ @@ -71,11 +70,15 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r && tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \ && ./configure --prefix=/usr/local \ && make && make install && libtool --finish /usr/local/lib && cd /tmp \ - && 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 \ + && wget -q http://is1.php.net/get/php-7.1.2.tar.gz/from/this/mirror -O php7.1.tar.gz \ + && tar xzf php7.1.tar.gz && cd /tmp/php-7.1.2/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 \ + && make && cp modules/iconv.so /usr/lib/php7.1/modules \ + && cd /tmp/php-7.1.2/ext/fileinfo && phpize7.1 \ + && ./configure --with-php-config=/usr/bin/php-config7.1 \ + && make && cp modules/fileinfo.so /usr/lib/php7.1/modules && cd /tmp \ && echo "extension=iconv.so" > /etc/php7.1/conf.d/00_iconv.ini \ + && echo "extension=fileinfo.so" > /etc/php7.1/conf.d/00_fileinfo.ini \ && echo "extension=smbclient.so" > /etc/php7.1/conf.d/00_smbclient.ini \ && echo "extension=redis.so" > /etc/php7.1/conf.d/redis.ini \ && sed -i 's|;session.save_path = "/tmp"|session.save_path = "/data/session"|g' /etc/php7.1/php.ini \ diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile index 7cb35f1..5b1cf72 100644 --- a/nextcloud/daily/Dockerfile +++ b/nextcloud/daily/Dockerfile @@ -1,7 +1,6 @@ FROM alpine:edge ARG GNU_LIBICONV_VERSION=1.15 -ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" ENV UID=991 GID=991 \ UPLOAD_MAX_SIZE=10G \ @@ -39,7 +38,6 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r php7.1-mbstring@testing \ php7.1-curl@testing \ php7.1-gd@testing \ - php7.1-fileinfo@testing \ php7.1-mcrypt@testing \ php7.1-opcache@testing \ php7.1-json@testing \ @@ -73,10 +71,14 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r && 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 \ + && make && cp modules/iconv.so /usr/lib/php7.1/modules \ + && cd /tmp/php-7.1.2/ext/fileinfo && phpize7.1 \ + && ./configure --with-php-config=/usr/bin/php-config7.1 \ + && make && cp modules/fileinfo.so /usr/lib/php7.1/modules && cd /tmp \ && echo "extension=iconv.so" > /etc/php7.1/conf.d/00_iconv.ini \ + && echo "extension=fileinfo.so" > /etc/php7.1/conf.d/00_fileinfo.ini \ && echo "extension=smbclient.so" > /etc/php7.1/conf.d/00_smbclient.ini \ - && echo "extension=redis.so" > /etc/php7.1/conf.d/redis.ini \ + && echo "extension=redis.so" > /etc/php7.1/conf.d/redis.ini \ && sed -i 's|;session.save_path = "/tmp"|session.save_path = "/data/session"|g' /etc/php7.1/php.ini \ && mkdir /nextcloud \ && wget -q https://download.nextcloud.com/server/daily/latest.tar.bz2 \