Merge branch 'ruby2.2.0'

seapy · Feb 11, 2015 · 6d4b173 · 6d4b173
2 parents d818e36 + 4e21bc1
commit 6d4b173
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -4,3 +4,8 @@
   * ruby, bundler, git, curl, wget
 * seapy/rails-nginx-unicorn
   * unicorn, nginx, foreman
+* seapy/rails-nginx-unicorn-pro
+  * unicorn, nginx, foreman
+* seapy/kibana
+* seapy/elasticsearch
+* seapy/fluentd-es
diff --git a/rails-nginx-unicorn-pro/Dockerfile b/rails-nginx-unicorn-pro/Dockerfile
@@ -1,4 +1,4 @@
-FROM seapy/ruby:2.1.2
+FROM seapy/ruby:2.2.0
 MAINTAINER ChangHoon Jeong <iamseapy@gmail.com>
 
 # Install nodejs

diff --git a/rails-nginx-unicorn-pro/README.md b/rails-nginx-unicorn-pro/README.md
@@ -13,7 +13,7 @@ Easy useable docker for rails. more configuration, affordable production.
 
 ```
 # Dockerfile
-FROM seapy/rails-nginx-unicorn-pro:v1.0-ruby2.1.2-nginx1.6.0
+FROM seapy/rails-nginx-unicorn-pro:v1.0-ruby2.2.0-nginx1.6.0
 MAINTAINER seapy(iamseapy@gmail.com)
 
 # Add here your preinstall lib(e.g. imagemagick, mysql lib, pg lib, ssh config)

diff --git a/rails-nginx-unicorn/Dockerfile b/rails-nginx-unicorn/Dockerfile
@@ -1,4 +1,4 @@
-FROM seapy/ruby:2.1.2
+FROM seapy/ruby:2.2.0
 MAINTAINER ChangHoon Jeong <iamseapy@gmail.com>
 
 # Install nodejs

diff --git a/rails-nginx-unicorn/README.md b/rails-nginx-unicorn/README.md
@@ -67,7 +67,7 @@ Change `FROM` instruction your Dockerfile
 
 ```
 # Dockerfile
-FROM seapy/rails-nginx-unicorn:ruby2.1.2-nginx1.6.0
+FROM seapy/rails-nginx-unicorn:ruby2.2.0-nginx1.6.0
 ...
 ```