From 88c8581a5afb141e119fc812d7579efa78888d61 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 31 Dec 2016 06:38:14 +0900
Subject: [PATCH] :v:

---
 docker/Dockerfile => Dockerfile |  0
 README.md                       | 16 ++++++++++++++++
 docker/README.md                | 15 ---------------
 3 files changed, 16 insertions(+), 15 deletions(-)
 rename docker/Dockerfile => Dockerfile (100%)
 delete mode 100644 docker/README.md

diff --git a/docker/Dockerfile b/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to Dockerfile
diff --git a/README.md b/README.md
index 83d6d9312..0ebd03d26 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,22 @@ Misskey requires two domains called the primary domain and the secondary domain.
 ### reCAPTCHA
 Please visit https://www.google.com/recaptcha/intro/ and generate keys.
 
+## Setup with Docker
+Ensure that the working directory is the repository root directory.
+
+To create misskey image:
+`sudo docker build -t misskey`
+
+To run misskey:
+`sudo docker run --rm -i -t -p $PORT:80 -v $(pwd):/root/misskey -v $DBPATH:/data/db misskey`
+
+where $PORT is the port used to access Misskey Web from host browser
+and $DBPATH is the path of MongoDB database on the host for data persistence.
+
+ex: `sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db misskey`
+
+Note that $(pwd) is the working directory.
+
 ## Launch
 `sudo npm start`
 
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index b97670e56..000000000
--- a/docker/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# How to use Misskey with Docker
-Ensure that the working directory is the repository root directory.
-
-To create misskey image:
-`sudo docker build -t misskey ./docker`
-
-To run misskey:
-`sudo docker run --rm -i -t -p $PORT:80 -v $(pwd):/root/misskey -v $DBPATH:/data/db misskey`
-
-where $PORT is the port used to access Misskey Web from host browser
-and $DBPATH is the path of MongoDB database on the host for data persistence.
-
-ex: `sudo docker run --rm -i -t -p 80:80 -v $(pwd):/root/misskey -v /data/db:/data/db misskey`
-
-Note that $(pwd) is the working directory.