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

---
 Dockerfile        | 32 ++++++++++++++++++++++++++++++++
 README.md         | 16 ++++++++++++++++
 docker/Dockerfile | 32 --------------------------------
 docker/README.md  | 15 ---------------
 4 files changed, 48 insertions(+), 47 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 docker/Dockerfile
 delete mode 100644 docker/README.md

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..481c7b6bce
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,32 @@
+FROM base/archlinux
+
+MAINTAINER Aya Morisawa
+
+RUN rm /etc/pacman.d/mirrorlist
+RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch'    >> /etc/pacman.d/mirrorlist
+RUN echo 'Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
+
+RUN rm /etc/localtime
+RUN ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+
+RUN pacman -Sy --noconfirm
+RUN pacman -S --noconfirm pacman
+RUN pacman-db-upgrade
+RUN pacman -S --noconfirm archlinux-keyring
+RUN pacman -Syyu --noconfirm
+
+RUN pacman -S --noconfirm git nodejs npm mongodb redis
+
+RUN echo '#!/bin/sh'                    >> /root/misskey.sh
+RUN echo 'redis-server --daemonize yes' >> /root/misskey.sh
+RUN echo 'mongod > /dev/null &'         >> /root/misskey.sh
+RUN echo 'cd /root/misskey'             >> /root/misskey.sh
+RUN echo 'npm start'                    >> /root/misskey.sh
+RUN echo 'tail -f /dev/null'            >> /root/misskey.sh
+RUN chmod u+x /root/misskey.sh
+
+EXPOSE 80
+EXPOSE 443
+EXPOSE 27017
+
+CMD ["/root/misskey.sh"]
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/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 481c7b6bce..0000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM base/archlinux
-
-MAINTAINER Aya Morisawa
-
-RUN rm /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch'    >> /etc/pacman.d/mirrorlist
-RUN echo 'Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
-
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
-
-RUN pacman -Sy --noconfirm
-RUN pacman -S --noconfirm pacman
-RUN pacman-db-upgrade
-RUN pacman -S --noconfirm archlinux-keyring
-RUN pacman -Syyu --noconfirm
-
-RUN pacman -S --noconfirm git nodejs npm mongodb redis
-
-RUN echo '#!/bin/sh'                    >> /root/misskey.sh
-RUN echo 'redis-server --daemonize yes' >> /root/misskey.sh
-RUN echo 'mongod > /dev/null &'         >> /root/misskey.sh
-RUN echo 'cd /root/misskey'             >> /root/misskey.sh
-RUN echo 'npm start'                    >> /root/misskey.sh
-RUN echo 'tail -f /dev/null'            >> /root/misskey.sh
-RUN chmod u+x /root/misskey.sh
-
-EXPOSE 80
-EXPOSE 443
-EXPOSE 27017
-
-CMD ["/root/misskey.sh"]
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.
-- 
cgit v1.2.3-freya