Page MenuHomeDevCentral
Files F3781985

D758.id1900.diff
No OneTemporary
Actions

D758.id1900.diff
View Options

diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@
# Prepare the container
#
-ENV PHP_VERSION 5.6.29
+ENV PHP_VERSION 7.1.0
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 \
@@ -26,6 +26,7 @@
ENV LANG C.UTF-8
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 autoconf \
+ libedit-dev libsqlite3-dev xz-utils
gcc libc-dev make pkg-config nginx-full \
runit nano less tmux wget git locales \
$PHP_BUILD_DEPS $PHP_EXTRA_BUILD_DEPS \
@@ -43,6 +44,9 @@
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
&& cd /usr/src/php \
+ && export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
+ && export CPPFLAGS="$CFLAGS" \
+ && export LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" \
&& ./configure \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
@@ -56,8 +60,11 @@
--with-gd \
--with-jpeg-dir \
--enable-gd-native-ttf \
+ --with-ftp \
+ --with-libedit
--enable-mbstring \
--with-mcrypt \
+ --with-mysqlnd \
--with-mysqli \
--with-pdo-mysql \
--enable-pcntl \
@@ -71,7 +78,7 @@
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps \
&& make clean \
- && pecl install APCu-4.0.10 \
+ && pecl install APCu \
&& cd /opt \
&& curl -sS https://getcomposer.org/installer | php \
&& ln -s /opt/composer.phar /usr/local/bin/composer

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 22:39 (19 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2265193
Default Alt Text
D758.id1900.diff (1 KB)

Event Timeline

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