hoellen/dockerfiles
1
0
Fork 0
mirror of https://github.com/hoellen/dockerfiles.git synced 2025-04-20 04:19:18 +00:00
Code Issues Projects Releases Wiki Activity

nextcloud: fix iconv

Browse Source
This commit is contained in:
Wonderfall 2016-09-22 17:04:31 +02:00
parent c68dafa391
commit 1c449456c2
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nextcloud/9.0/Dockerfile
View File

@ -2,6 +2,7 @@ FROM alpine:3.4
MAINTAINER Wonderfall <wonderfall@schrodinger.io> MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG NEXTCLOUD_VERSION=9.0.53 ARG NEXTCLOUD_VERSION=9.0.53
ARG GNU_LIBICONV_VERSION=1.14
ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
ENV UID=991 GID=991 \ ENV UID=991 GID=991 \
@ -11,7 +12,13 @@ ENV UID=991 GID=991 \
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& BUILD_DEPS="gnupg tar" \ && BUILD_DEPS=" \
gnupg \
tar \
build-base \
autoconf \
automake \
libtool" \
&& apk -U add \ && apk -U add \
${BUILD_DEPS} \ ${BUILD_DEPS} \
nginx \ nginx \
@ -34,7 +41,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
php7-pdo@commuedge \ php7-pdo@commuedge \
php7-dom@commuedge \ php7-dom@commuedge \
php7-ctype@commuedge \ php7-ctype@commuedge \
php7-iconv@commuedge \
php7-pdo_mysql@commuedge \ php7-pdo_mysql@commuedge \
php7-pdo_pgsql@commuedge \ php7-pdo_pgsql@commuedge \
php7-pgsql@commuedge \ php7-pgsql@commuedge \
@ -49,7 +55,22 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
php7-ftp@commuedge \ php7-ftp@commuedge \
php7-apcu@testing \ php7-apcu@testing \
php7-redis@testing \ php7-redis@testing \
php7-pear@commuedge \
php7-dev@commuedge \
&& mkdir /nextcloud && cd /tmp \ && mkdir /nextcloud && 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 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.11.tar.gz/from/this/mirror -O php7.tar.gz \
&& tar xzf php7.tar.gz && cd /tmp/php-7.0.11/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 \
&& NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
&& wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \ && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \
&& wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha256 \ && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha256 \
@ -65,7 +86,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
&& if [ "${FINGERPRINT}" != "${GPG_nextcloud}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \ && if [ "${FINGERPRINT}" != "${GPG_nextcloud}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
&& echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \ && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \
&& tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \ && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \
&& apk del ${BUILD_DEPS} \ && apk del ${BUILD_DEPS} php7-pear php7-dev \
&& rm -rf /var/cache/apk/* /tmp/* /root/.gnupg && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

28
nextcloud/daily/Dockerfile
View File

@ -1,6 +1,8 @@
FROM alpine:3.4 FROM alpine:3.4
MAINTAINER Wonderfall <wonderfall@schrodinger.io> MAINTAINER Wonderfall <wonderfall@schrodinger.io>
ARG GNU_LIBICONV_VERSION=1.14
ENV UID=991 GID=991 \ ENV UID=991 GID=991 \
UPLOAD_MAX_SIZE=10G \ UPLOAD_MAX_SIZE=10G \
APC_SHM_SIZE=128M \ APC_SHM_SIZE=128M \
@ -8,7 +10,13 @@ ENV UID=991 GID=991 \
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& BUILD_DEPS="tar" \ && BUILD_DEPS=" \
gnupg \
tar \
build-base \
autoconf \
automake \
libtool" \
&& apk -U add \ && apk -U add \
${BUILD_DEPS} \ ${BUILD_DEPS} \
nginx \ nginx \
@ -31,7 +39,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
php7-pdo@commuedge \ php7-pdo@commuedge \
php7-dom@commuedge \ php7-dom@commuedge \
php7-ctype@commuedge \ php7-ctype@commuedge \
php7-iconv@commuedge \
php7-pdo_mysql@commuedge \ php7-pdo_mysql@commuedge \
php7-pdo_pgsql@commuedge \ php7-pdo_pgsql@commuedge \
php7-pgsql@commuedge \ php7-pgsql@commuedge \
@ -46,10 +53,25 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
php7-ftp@commuedge \ php7-ftp@commuedge \
php7-apcu@testing \ php7-apcu@testing \
php7-redis@testing \ php7-redis@testing \
php7-pear@commuedge \
php7-dev@commuedge \
&& mkdir /nextcloud && cd /tmp \ && mkdir /nextcloud && 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 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.11.tar.gz/from/this/mirror -O php7.tar.gz \
&& tar xzf php7.tar.gz && cd /tmp/php-7.0.11/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 \
&& wget -q https://download.nextcloud.com/server/daily/latest.tar.bz2 \ && wget -q https://download.nextcloud.com/server/daily/latest.tar.bz2 \
&& tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \ && tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \
&& apk del ${BUILD_DEPS} \ && apk del ${BUILD_DEPS} php7-pear php7-dev \
&& rm -rf /var/cache/apk/* /tmp/* && rm -rf /var/cache/apk/* /tmp/*
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf