Page MenuHomeDevCentral
Files F3784329

D2235.diff
No OneTemporary
Actions

D2235.diff
View Options

diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@
# Prepare the container
#
-ENV PHP_VERSION 7.3.14
+ENV PHP_VERSION 7.4.2
+ENV ONIGURAMA_VERSION 6.9.4
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
@@ -37,8 +38,8 @@
&& dpkg-reconfigure locales
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
- CBAF69F173A0FEA4B537F470D66C9593118BCCB6 \
- F38252826ACD957EF380D39F2F7956BC5DA04B5D \
+ 5A52880781F755608BF815FC910DEB46F53EA312 \
+ 42670A7FE4D0441C8E4632349E4FDC074A4EF02D \
&& mkdir -p $PHP_INI_DIR/conf.d \
&& set -x \
&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
@@ -47,6 +48,11 @@
&& mkdir -p /usr/src/php \
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
+ && wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
+ && cd /usr/src \
+ && tar xzf onigurama.tar.gz \
+ && cd onig-$ONIGURAMA_VERSION \
+ && ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
&& export CPPFLAGS="$CFLAGS" \
@@ -61,11 +67,11 @@
--with-bz2 \
--enable-calendar \
--with-curl \
- --with-gd \
- --with-jpeg-dir \
- --with-freetype-dir \
- --with-xpm-dir \
- --with-webp-dir \
+ --enable-gd \
+ --with-jpeg \
+ --with-freetype \
+ --with-xpm \
+ --with-webp \
--enable-exif \
--enable-ftp \
--with-libedit \
@@ -77,8 +83,8 @@
--with-xsl \
--with-readline \
--with-zlib \
- --enable-zip \
- --with-libzip \
+ --with-zip \
+ --with-pear \
&& make -j"$(nproc)" \
&& make install \
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
Your web directory — if you don't add vhosts — is
`/var/wwwroot/default` (mounted as volume).
-The PHP last 7.1 version is compiled through a build process borrowed from
+The PHP last 7 version is compiled through a build process borrowed from
the official PHP Docker image, with [this Dockerfile used](https://github.com/docker-library/php/blob/08bf31dfd492f02a2696c9a30eb85326b1570abd/5.6/fpm/Dockerfile).
We add common extensions like calendar, curl, gd, iconv, libxml, mbstring,
diff --git a/novolume/Dockerfile b/novolume/Dockerfile
--- a/novolume/Dockerfile
+++ b/novolume/Dockerfile
@@ -9,7 +9,8 @@
# Prepare the container
#
-ENV PHP_VERSION 7.3.14
+ENV PHP_VERSION 7.4.2
+ENV ONIGURAMA_VERSION 6.9.4
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
@@ -47,6 +48,11 @@
&& mkdir -p /usr/src/php \
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
+ && wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
+ && cd /usr/src \
+ && tar xzf onigurama.tar.gz \
+ && cd onig-$ONIGURAMA_VERSION \
+ && ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
&& export CPPFLAGS="$CFLAGS" \
@@ -61,11 +67,11 @@
--with-bz2 \
--enable-calendar \
--with-curl \
- --with-gd \
- --with-jpeg-dir \
- --with-freetype-dir \
- --with-xpm-dir \
- --with-webp-dir \
+ --enable-gd \
+ --with-jpeg \
+ --with-freetype \
+ --with-xpm \
+ --with-webp \
--enable-exif \
--enable-ftp \
--with-libedit \
@@ -77,8 +83,8 @@
--with-xsl \
--with-readline \
--with-zlib \
- --enable-zip \
- --with-libzip \
+ --with-zip \
+ --with-pear \
&& make -j"$(nproc)" \
&& make install \
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 05:34 (22 h, 23 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2266133
Default Alt Text
D2235.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator