Skip to content

Commit b19fdc4

Browse files
committed
Upgraded to 0.3.0 of parent and upgraded tools
1 parent f049fbe commit b19fdc4

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

Dockerfile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM andrewholgate/drupal-php70:0.2.0
1+
FROM andrewholgate/drupal-php70:0.3.0
22
MAINTAINER Andrew Holgate <[email protected]>
33

44
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
@@ -8,15 +8,16 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
88
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-sphinx python-pip doxygen && \
99
DEBIAN_FRONTEND=noninteractive pip install sphinx_rtd_theme breathe
1010

11-
# Install XDebug
12-
RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0RC2.tar.gz && \
13-
tar zxvf XDEBUG_2_4_0RC2.tar.gz && \
14-
cd xdebug-XDEBUG_2_4_0RC2 && \
11+
# Install XDebug 2.4.0 RC3
12+
RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0RC3.tar.gz && \
13+
tar zxvf XDEBUG_2_4_0RC3.tar.gz && \
14+
rm -f XDEBUG_2_4_0RC3.tar.gz && \
15+
cd xdebug-XDEBUG_2_4_0RC3 && \
1516
phpize && \
1617
./configure --enable-xdebug && \
1718
make && \
1819
cp modules/xdebug.so /usr/lib/php/20151012/ && \
19-
cd .. && rm -Rf xdebug-XDEBUG_2_4_0RC2
20+
rm -Rf ../xdebug-XDEBUG_2_4_0RC3
2021

2122
COPY xdebug.ini /etc/php/mods-available/xdebug.ini
2223
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/
2728
# Install XHProf
2829
#RUN wget https://github.com/phacility/xhprof/archive/master.tar.gz && \
2930
# tar zxvf master.tar.gz && \
31+
# rm -f master.tar.gz
3032
# cd xhprof-master/extension/ && \
3133
# phpize && \
3234
# ./configure --with-php-config=/usr/bin/php-config7.0 && \
3335
# make && \
3436
# make install && \
3537
# make test && \
36-
# cd .. && rm -RF xhprof-master
38+
# rm -Rf ../xhprof-master
3739

3840
# Install JRE (needed for some testing tools like sitespeed.io) and libs for PhantomJS.
3941
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install default-jre libfreetype6 libfontconfig
4042

41-
# Install Node 4.2.3
43+
# Install Node 4.2.4 LTS
4244
RUN cd /opt && \
43-
wget https://nodejs.org/dist/v4.2.3/node-v4.2.3-linux-x64.tar.gz && \
44-
tar -xzf node-v4.2.3-linux-x64.tar.gz && \
45-
mv node-v4.2.3-linux-x64 node && \
45+
wget https://nodejs.org/dist/v4.2.4/node-v4.2.4-linux-x64.tar.gz && \
46+
tar -xzf node-v4.2.4-linux-x64.tar.gz && \
47+
mv node-v4.2.4-linux-x64 node && \
4648
cd /usr/local/bin && \
4749
ln -s /opt/node/bin/* . && \
48-
rm -f /opt/node-v4.2.3-linux-x64.tar.gz
50+
rm -f /opt/node-v4.2.4-linux-x64.tar.gz
4951

5052
USER ubuntu
5153
RUN echo 'export PATH="$PATH:$HOME/.npm-packages/bin"' >> ~/.bashrc && \

0 commit comments

Comments
 (0)