From 2215edd81bcbcaa19b41d0522b90e914c1e93011 Mon Sep 17 00:00:00 2001
From: star7th <xing7th@gmail.com>
Date: Sun, 6 Nov 2016 16:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81Docker=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile    | 14 ++++++++++++++
 composer.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..1792acfb0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM php:5.6-apache
+COPY ./ /var/www/html/
+
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libmcrypt-dev \
+        libpng12-dev \
+    && docker-php-ext-install -j$(nproc) gd mcrypt
+
+
+RUN chmod -R 777 /var/www/html/
+
+CMD ["apache2-foreground"]
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 06fc81246..3e3b76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "description": "ShowDoc is a tool greatly applicable for an IT team to share documents online",
     "keywords": ["showdoc","documents","Api"],
     "homepage": "https://github.com/star7th/showdoc",
-    "version":"v1.2.0",
+    "version":"v1.2.1",
     "license": "Apache-2.0",
     "authors": [
         {