From f8cf0fa6792836c91ad082aa757fd24fda412c49 Mon Sep 17 00:00:00 2001
From: zachary <zachary@zacharyboyd.nyc>
Date: Wed, 17 Jun 2015 19:58:34 -0400
Subject: [PATCH 1/2] Adds dockerfile

---
 .dockerignore | 16 ++++++++++++++++
 Dockerfile    |  9 +++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..e5908c26ac0
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,16 @@
+build
+build.xml
+ChangeLog
+composer.json
+CONTRIBUTING.md
+COPYING
+COPYRIGHT
+dev
+doc
+Dockerfile
+INSTALL
+README-FR.md
+README.md
+robots.txt
+scripts
+test
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000000..6c70913f8b7
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM php:5.6-apache
+
+RUN apt-get update && apt-get install -y php5-gd php5-mysql
+
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+EXPOSE 80
\ No newline at end of file

From 0ef8ea269b682b78938d86bdf79123fdc0a7d48f Mon Sep 17 00:00:00 2001
From: zachary <zachary@zacharyboyd.nyc>
Date: Wed, 17 Jun 2015 20:20:58 -0400
Subject: [PATCH 2/2] Adds php-gd and mysqli to dockerfile

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6c70913f8b7..a5eb941c781 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,11 @@
 FROM php:5.6-apache
 
-RUN apt-get update && apt-get install -y php5-gd php5-mysql
+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
 
 COPY htdocs/ /var/www/html/