Merge pull request #44 from vpetersson/master

Fixes #43. Adds support for JPEG.

Author: tianon

Dockerfile

@@ -5,9 +5,9 @@ RUN apt-get update && apt-get install -y rsync && rm -r /var/lib/apt/lists/*
 RUN a2enmod rewrite
 
 # install the PHP extensions we need
-RUN apt-get update && apt-get install -y libpng12-dev && rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-install gd \
-	&& apt-get purge --auto-remove -y libpng12-dev
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev && rm -rf /var/lib/apt/lists/* \
+ 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd
 RUN docker-php-ext-install mysqli
 
 VOLUME /var/www/html