Merge branch 'develop'

Author: andrewholgate

Dockerfile

@@ -1,4 +1,4 @@
-FROM andrewholgate/drupal-php70:0.4.2
+FROM andrewholgate/drupal-php70:0.5.0
 MAINTAINER Andrew Holgate <[email protected]>
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
@@ -10,7 +10,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-sphinx python-pip d
 
 # XML needed by PHPCodeSniffer 2.3+
 # SQLite needed by Phan
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php7.0-xml php7.0-sqlite php-ast
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install php-xml php-sqlite3 php-ast
 
 # Install XDebug 2.4.0
 RUN wget https://github.com/xdebug/xdebug/archive/XDEBUG_2_4_0.tar.gz && \
@@ -37,7 +37,7 @@ RUN ln -s /var/log/xdebug/xdebug.log /var/www/log/ && \
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install default-jre libfreetype6 libfontconfig
 
 # Install Node 4 LTS (https://nodejs.org/)
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
+RUN curl -sL https://deb.nodesource.com/setup_4.x | bash -
 RUN apt-get install -y nodejs
 RUN update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10
 

README.md

@@ -1,4 +1,4 @@
-Dockerised Drupal 8 development environment using PHP 7.0 on Ubuntu 14.04 with HTTP/2. This image is the development companion to the [docker-drupal-php70](https://github.com/andrewholgate/docker-drupal-php70) project.
+Dockerised Drupal 8 development environment using PHP 7.0 on Ubuntu 16.04 with HTTP/2. This image is the development companion to the [docker-drupal-php70](https://github.com/andrewholgate/docker-drupal-php70) project.
 
 # Included Tools
 

host.sh

@@ -16,5 +16,3 @@ $CONTAINER_NAME) $URL >> /etc/hosts"
 echo
 echo Login to container: sudo docker exec -it $CONTAINER_NAME su - ubuntu
 echo Opening site: xdg-open http://$URL
-
-