From 5510ec0e38c34283664ad4871f341890eb71558c Mon Sep 17 00:00:00 2001 From: Andrew Holgate Date: Fri, 15 Jan 2016 15:18:06 +0100 Subject: [PATCH 1/3] Disable Google Pagespeed --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 76ec51c..f40475f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,6 +78,9 @@ RUN sed -ri 's/^display_errors\s*=\s*Off/display_errors = On/g' /etc/php/7.0/fpm sed -ri 's/^;xmlrpc_errors\s*=\s*0/xmlrpc_errors = 1/g' /etc/php/7.0/fpm/php.ini && \ sed -ri 's/^;xmlrpc_errors\s*=\s*0/xmlrpc_errors = 1/g' /etc/php/7.0/cli/php.ini +# Disable Google Pagespeed +RUN sed -ri 's/\s*ModPagespeed on/ ModPagespeed off/g' /etc/apache2/mods-available/pagespeed.conf + # Grant ubuntu user access to sudo with no password. RUN apt-get -y install sudo && \ echo "ubuntu ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ From f049fbe3f44e5372b92e134929855497e2b30679 Mon Sep 17 00:00:00 2001 From: Andrew Holgate Date: Sat, 16 Jan 2016 00:37:34 +0100 Subject: [PATCH 2/3] Removed php70-dev and added to non -dev container --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f40475f..61cb2fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-sphinx python-pip doxygen && \ DEBIAN_FRONTEND=noninteractive pip install sphinx_rtd_theme breathe -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php7.0-dev - # Install XDebug RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0RC2.tar.gz && \ tar zxvf XDEBUG_2_4_0RC2.tar.gz && \ From b19fdc42a8a382bead531784b4e600ce37f50144 Mon Sep 17 00:00:00 2001 From: Andrew Holgate Date: Sat, 16 Jan 2016 12:34:03 +0100 Subject: [PATCH 3/3] Upgraded to 0.3.0 of parent and upgraded tools --- Dockerfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61cb2fc..2aafbd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewholgate/drupal-php70:0.2.0 +FROM andrewholgate/drupal-php70:0.3.0 MAINTAINER Andrew Holgate RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ @@ -8,15 +8,16 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-sphinx python-pip doxygen && \ DEBIAN_FRONTEND=noninteractive pip install sphinx_rtd_theme breathe -# Install XDebug -RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0RC2.tar.gz && \ - tar zxvf XDEBUG_2_4_0RC2.tar.gz && \ - cd xdebug-XDEBUG_2_4_0RC2 && \ +# Install XDebug 2.4.0 RC3 +RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0RC3.tar.gz && \ + tar zxvf XDEBUG_2_4_0RC3.tar.gz && \ + rm -f XDEBUG_2_4_0RC3.tar.gz && \ + cd xdebug-XDEBUG_2_4_0RC3 && \ phpize && \ ./configure --enable-xdebug && \ make && \ cp modules/xdebug.so /usr/lib/php/20151012/ && \ - cd .. && rm -Rf xdebug-XDEBUG_2_4_0RC2 + rm -Rf ../xdebug-XDEBUG_2_4_0RC3 COPY xdebug.ini /etc/php/mods-available/xdebug.ini RUN ln -s /etc/php/mods-available/xdebug.ini /etc/php/7.0/cli/conf.d/20-xdebug.ini @@ -27,25 +28,26 @@ RUN ln -s /var/log/xdebug/xdebug.log /var/www/log/ # Install XHProf #RUN wget https://github.com/phacility/xhprof/archive/master.tar.gz && \ # tar zxvf master.tar.gz && \ +# rm -f master.tar.gz # cd xhprof-master/extension/ && \ # phpize && \ # ./configure --with-php-config=/usr/bin/php-config7.0 && \ # make && \ # make install && \ # make test && \ -# cd .. && rm -RF xhprof-master +# rm -Rf ../xhprof-master # Install JRE (needed for some testing tools like sitespeed.io) and libs for PhantomJS. RUN DEBIAN_FRONTEND=noninteractive apt-get -y install default-jre libfreetype6 libfontconfig -# Install Node 4.2.3 +# Install Node 4.2.4 LTS RUN cd /opt && \ - wget https://nodejs.org/dist/v4.2.3/node-v4.2.3-linux-x64.tar.gz && \ - tar -xzf node-v4.2.3-linux-x64.tar.gz && \ - mv node-v4.2.3-linux-x64 node && \ + wget https://nodejs.org/dist/v4.2.4/node-v4.2.4-linux-x64.tar.gz && \ + tar -xzf node-v4.2.4-linux-x64.tar.gz && \ + mv node-v4.2.4-linux-x64 node && \ cd /usr/local/bin && \ ln -s /opt/node/bin/* . && \ - rm -f /opt/node-v4.2.3-linux-x64.tar.gz + rm -f /opt/node-v4.2.4-linux-x64.tar.gz USER ubuntu RUN echo 'export PATH="$PATH:$HOME/.npm-packages/bin"' >> ~/.bashrc && \