update php

suconghou · Nov 4, 2018 · 63073df · 63073df
1 parent 896242d
commit 63073df
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/goproxy/Dockerfile b/goproxy/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine AS build
 RUN apk add binutils && \
-wget -O- https://github.com/snail007/goproxy/releases/download/v6.4/proxy-linux-amd64.tar.gz | tar xz && \
+wget -O- https://github.com/snail007/goproxy/releases/download/v6.5/proxy-linux-amd64.tar.gz | tar xz && \
 strip -s proxy
 
 FROM alpine

diff --git a/php/Dockerfile b/php/Dockerfile
@@ -5,7 +5,7 @@ RUN LIBXSLT_VERSION=libxslt-1.1.32 && wget ftp://xmlsoft.org/libxslt/${LIBXSLT_V
 RUN CURL_VERSION=curl-7.61.1 && wget --no-check-certificate https://curl.haxx.se/download/${CURL_VERSION}.tar.xz && tar Jxf ${CURL_VERSION}.tar.xz && cd ${CURL_VERSION} && ./configure && make -j2 && make install
 RUN LIBFREETYPE_VERSION=freetype-2.9.1 && wget --no-check-certificate https://download.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config
 RUN PHP_VERSION=php-7.2.11 && wget http://php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \
-export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --disable-opcache --enable-fpm --disable-phpdbg --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-gd --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
+export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --disable-opcache --enable-fpm --disable-phpdbg --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
 sed -i "s{-export-dynamic{-all-static{" Makefile && make -j4 && make install
 RUN cd php-7.*.* && mv /usr/local/etc/php-fpm.conf.default /usr/local/etc/php-fpm.conf && mv /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf && mkdir -p /var/log/php-fpm && \
 sed -i '/^;error_log.*/cerror_log = \/var\/log\/php-fpm\/php-fpm.log' /usr/local/etc/php-fpm.conf && \

diff --git a/php/Dockerfile-opcache b/php/Dockerfile-opcache
@@ -5,7 +5,7 @@ RUN LIBXSLT_VERSION=libxslt-1.1.32 && wget ftp://xmlsoft.org/libxslt/${LIBXSLT_V
 RUN CURL_VERSION=curl-7.61.1 && wget --no-check-certificate https://curl.haxx.se/download/${CURL_VERSION}.tar.xz && tar Jxf ${CURL_VERSION}.tar.xz && cd ${CURL_VERSION} && ./configure && make -j2 && make install
 RUN LIBFREETYPE_VERSION=freetype-2.9.1 && wget --no-check-certificate https://download.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config
 RUN PHP_VERSION=php-7.2.11 && wget http://php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION} && \
-export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --enable-opcache --enable-fpm --disable-phpdbg --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-gd --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
+export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --enable-opcache --enable-fpm --disable-phpdbg --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-imagick --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
 sed -i "s{-export-dynamic{-all-static{" Makefile && make && make install
 RUN cd php-7.*.* && mv /usr/local/etc/php-fpm.conf.default /usr/local/etc/php-fpm.conf && mv /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf && mkdir -p /var/log/php-fpm && \
 sed -i '/^;error_log.*/cerror_log = \/var\/log\/php-fpm\/php-fpm.log' /usr/local/etc/php-fpm.conf && \

diff --git a/php/Dockerfile-redis b/php/Dockerfile-redis
@@ -4,13 +4,15 @@ RUN LIBXML2_VERSION=libxml2-2.9.8 && wget ftp://xmlsoft.org/libxml2/${LIBXML2_VE
 RUN LIBXSLT_VERSION=libxslt-1.1.32 && wget ftp://xmlsoft.org/libxslt/${LIBXSLT_VERSION}.tar.gz && tar zxf ${LIBXSLT_VERSION}.tar.gz && cd ${LIBXSLT_VERSION} && ./configure && make -j2 && make install
 RUN CURL_VERSION=curl-7.61.1 && wget --no-check-certificate https://curl.haxx.se/download/${CURL_VERSION}.tar.xz && tar Jxf ${CURL_VERSION}.tar.xz && cd ${CURL_VERSION} && ./configure && make -j2 && make install
 RUN LIBFREETYPE_VERSION=freetype-2.9.1 && wget --no-check-certificate https://download.savannah.gnu.org/releases/freetype/${LIBFREETYPE_VERSION}.tar.gz && tar zxf ${LIBFREETYPE_VERSION}.tar.gz && cd ${LIBFREETYPE_VERSION} && ./configure && make && make install && ln -s $(pwd)/builds/unix/freetype-config /usr/local/bin/freetype-config
+RUN IMAGEMAGICK_VERSION=7.0.8-14 && wget -O- https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz | tar xz && cd ImageMagick-${IMAGEMAGICK_VERSION} && ./configure --without-threads && make -j8 && make install
 RUN PHP_VERSION=php-7.2.11 && wget http://php.net/distributions/${PHP_VERSION}.tar.xz && tar xJf ${PHP_VERSION}.tar.xz && cd ${PHP_VERSION}
 RUN REDIS_VERSION=redis-4.1.1 && cd php-7.*.* && wget https://pecl.php.net/get/${REDIS_VERSION}.tgz && tar zxf ${REDIS_VERSION}.tgz && mv ${REDIS_VERSION} ext/php-redis
 RUN MSGPACK_VERSION=msgpack-2.0.2 && cd php-7.*.* && wget https://pecl.php.net/get/${MSGPACK_VERSION}.tgz && tar zxf ${MSGPACK_VERSION}.tgz && mv ${MSGPACK_VERSION} ext/msgpack
 RUN IGBINARY_VERSION=igbinary-2.0.8 && cd php-7.*.* && wget https://pecl.php.net/get/${IGBINARY_VERSION}.tgz && tar zxf ${IGBINARY_VERSION}.tgz && mv ${IGBINARY_VERSION} ext/igbinary
+RUN IMAGICK_VERSION=imagick-3.4.3 && cd php-7.*.* && wget https://pecl.php.net/get/${IMAGICK_VERSION}.tgz && tar zxf ${IMAGICK_VERSION}.tgz && mv ${IMAGICK_VERSION} ext/imagick
 RUN cd php-7.*.* && rm -rf configure && ./buildconf --force && \
-export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --disable-opcache --enable-fpm --disable-phpdbg --enable-igbinary --with-msgpack --enable-redis --enable-redis-igbinary --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-gd --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
-sed -i "s{-export-dynamic{-all-static{" Makefile && make && make install
+export CFLAGS="-Os" && LDFLAGS="-static" LIBS="$(curl-config --static-libs)" && ./configure --enable-inline-optimization --enable-static=yes --enable-shared=no --prefix=/usr/local --with-config-file-path=/etc --without-pear --disable-cgi --disable-opcache --enable-fpm --disable-phpdbg --enable-igbinary --with-msgpack --enable-redis --enable-redis-igbinary --enable-pcntl --enable-sockets --enable-ftp --enable-bcmath --enable-zip --with-zlib --enable-mbstring --with-imagick --with-gd --with-freetype-dir=/usr/local/include/freetype2/freetype --with-mysqli --with-pdo-mysql --with-openssl --enable-exif --enable-calendar --with-bz2 --enable-sysvsem --enable-sysvshm --enable-sysvmsg --enable-shmop --with-xsl --with-curl=/usr/local/ && \
+sed -i "s{-export-dynamic{-all-static{" Makefile && make -j8 && make install
 RUN cd php-7.*.* && mv /usr/local/etc/php-fpm.conf.default /usr/local/etc/php-fpm.conf && mv /usr/local/etc/php-fpm.d/www.conf.default /usr/local/etc/php-fpm.d/www.conf && mkdir -p /var/log/php-fpm && \
 sed -i '/^;error_log.*/cerror_log = \/var\/log\/php-fpm\/php-fpm.log' /usr/local/etc/php-fpm.conf && \
 sed -i '/^;pid.*/cpid = \/var\/run\/php-fpm.pid' /usr/local/etc/php-fpm.conf && \