Page MenuHomeDevCentral
Files F3777160

D758.id1907.diff
No OneTemporary
Actions

D758.id1907.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 \
@@ -33,7 +34,10 @@
RUN dpkg-reconfigure locales
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 \
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
+ 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 \
+ 0BD78B5F97500D450838F95DFE857D9A90D90EC1 \
+ A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 \
&& 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 \
@@ -43,6 +47,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,6 +63,8 @@
--with-gd \
--with-jpeg-dir \
--enable-gd-native-ttf \
+ --enable-ftp \
+ --with-libedit \
--enable-mbstring \
--with-mcrypt \
--with-mysqli \
@@ -71,7 +80,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
diff --git a/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini b/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini
deleted file mode 100644
--- a/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini
+++ /dev/null
@@ -1 +0,0 @@
-always_populate_raw_post_data=-1
diff --git a/novolume/Dockerfile b/novolume/Dockerfile
--- a/novolume/Dockerfile
+++ b/novolume/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,14 +26,18 @@
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 \
--no-install-recommends && rm -r /var/lib/apt/lists/*
-RUN dpkg-reconfigure locales
+RUN dpkg-reconfigure locales
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 \
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
+ 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 \
+ 0BD78B5F97500D450838F95DFE857D9A90D90EC1 \
+ A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 \
&& 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 \
@@ -43,6 +47,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,6 +63,8 @@
--with-gd \
--with-jpeg-dir \
--enable-gd-native-ttf \
+ --enable-ftp \
+ --with-libedit \
--enable-mbstring \
--with-mcrypt \
--with-mysqli \
@@ -71,7 +80,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
@@ -84,7 +93,7 @@
chmod 700 /home/app && \
chmod 711 /var/wwwroot/default
-COPY files /
+COPY files /
#
# Docker properties
diff --git a/novolume/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini b/novolume/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini
deleted file mode 100644
--- a/novolume/files/usr/local/etc/php/conf.d/disable-legacy-behavior.ini
+++ /dev/null
@@ -1 +0,0 @@
-always_populate_raw_post_data=-1

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 00:33 (3 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2263577
Default Alt Text
D758.id1907.diff (5 KB)

Event Timeline

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