summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile (renamed from docker/Dockerfile)0
-rw-r--r--README.md16
-rw-r--r--docker/README.md15
3 files changed, 16 insertions, 15 deletions
diff --git a/docker/Dockerfile b/Dockerfile
index 481c7b6bce..481c7b6bce 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
diff --git a/README.md b/README.md
index 83d6d93126..0ebd03d262 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 b97670e566..0000000000
--- 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.