Merge pull request #522 from tdiary/docker

support docker
tdiary · Apr 19, 2016 · 8e809e1 · 8e809e1
2 parents 4b682f2 + fb4eaa6
commit 8e809e1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+.bundle
+vendor/bundle
+public/assets/*
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2016-04-19  MATSUOKA Kohei <kohei@machu.jp>
+	* Dockerfile: support docker
+
 2016-04-01  TADA Tadashi <t@tdtds.jp>
 	* category.rb: enable to call category_list and category_dropdown_list
 	plugins in diary header

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,17 @@
+FROM ruby:2.3
+MAINTAINER MATSUOKA Kohei @machu
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY [ "Gemfile", "Gemfile.lock", "/usr/src/app/" ]
+RUN bundle --path=vendor/bundle --without=development:test --jobs=4 --retry=3
+
+COPY . /usr/src/app/
+RUN if [ ! -e tdiary.conf ]; then cp tdiary.conf.beginner tdiary.conf; fi && \
+    bundle && \
+    bundle exec rake assets:copy
+
+VOLUME [ "/usr/src/app/data", "/usr/src/app/public" ]
+EXPOSE 9292
+CMD [ "bundle", "exec", "rackup", "-o", "0.0.0.0", "-p", "9292" ]
diff --git a/lib/tdiary/version.rb b/lib/tdiary/version.rb
@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '5.0.0.20160401'
+	VERSION = '5.0.0.20160419'
 end