Skip to content

Develop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewholgate merged 3 commits into from
Jan 16, 2016
Merged

Develop #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5510ec0
Disable Google Pagespeed
andrewholgate Jan 15, 2016
f049fbe
Removed php70-dev and added to non -dev container
andrewholgate Jan 15, 2016
b19fdc4
Upgraded to 0.3.0 of parent and upgraded tools
andrewholgate Jan 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM andrewholgate/drupal-php70:0.2.0
FROM andrewholgate/drupal-php70:0.3.0
MAINTAINER Andrew Holgate <andrewholgate@yahoo.com>

RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
Expand All @@ -8,17 +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

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 && \
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
Expand All @@ -29,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 && \
Expand Down Expand Up @@ -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 && \
Expand Down