Merge pull request #1 from tlvu/master

Update to latest ubuntu LTS base image with gives newer version of mercurial

Dockerfile

@@ -1,14 +1,10 @@
 # http://mercurial.selenic.com/wiki/HgWebDirStepByStep#Directory_Structure
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER Alex McLain <[email protected]>
 
 RUN apt-get -qq update
-RUN apt-get -y install apache2 apache2-utils curl mercurial php5 php5-cli php5-mcrypt
-
-# TODO: Remove
-RUN apt-get -y install vim
-RUN echo "colorscheme delek" > ~/.vimrc
+RUN apt-get -y install apache2 apache2-utils curl mercurial php php-cli php-mcrypt
 
 # Configure hgweb
 ADD hg/add.php      /etc/default/hgweb/hg/
@@ -28,4 +24,4 @@ VOLUME /var/hg
 VOLUME /etc/apache2/sites-available
 EXPOSE 80
 
-CMD load-default-scripts && service apache2 start && /bin/bash
+CMD load-default-scripts && service apache2 reload; apache2ctl -DFOREGROUND