From 63b49a43cfc888232eaf65688b08ba42727701f8 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Sat, 31 Dec 2016 13:00:11 +0900
Subject: Move Dockerfile to ./docker

---
 Dockerfile        | 32 --------------------------------
 README.md         |  2 +-
 docker/Dockerfile | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker/Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 481c7b6bce..0000000000
--- a/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/README.md b/README.md
index c4854b27c5..5ee4f3e1e7 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Please visit https://www.google.com/recaptcha/intro/ and generate keys.
 Ensure that the working directory is the repository root directory.
 
 To create misskey image:
-`sudo docker build -t misskey`
+`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`
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000..481c7b6bce
--- /dev/null
+++ b/docker/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"]
-- 
cgit v1.2.3-freya