From 02f3459ebe46e2f829f2ad3ba21ac2e4016d83bd Mon Sep 17 00:00:00 2001
From: "Marcelo B. Alexandre" <marcelobalexandre@gmail.com>
Date: Sun, 6 Aug 2017 09:59:50 -0300
Subject: [PATCH] Add Ruby 2.4.1

---
 2.4/Dockerfile | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile       |  6 ++++--
 README.md      |  6 +++---
 3 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 2.4/Dockerfile

diff --git a/2.4/Dockerfile b/2.4/Dockerfile
new file mode 100644
index 0000000..be2d14d
--- /dev/null
+++ b/2.4/Dockerfile
@@ -0,0 +1,49 @@
+# The container includes:
+#
+# azukiapp/ruby:
+# * MRI Ruby 2.4.0
+# * Bundler
+# * Image Magick
+#
+
+FROM azukiapp/node
+MAINTAINER Azuki <support@azukiapp.com>
+
+ENV RUBY_MAJOR 2.4
+ENV RUBY_VERSION 2.4.1
+
+# Set $PATH so that non-login shells will see the Ruby binaries
+ENV PATH $PATH:/opt/rubies/ruby-$RUBY_VERSION/bin
+
+# Install MRI Ruby $RUBY_VERSION
+RUN curl -O http://ftp.ruby-lang.org/pub/ruby/$RUBY_MAJOR/ruby-$RUBY_VERSION.tar.gz && \
+    tar -zxvf ruby-$RUBY_VERSION.tar.gz && \
+    cd ruby-$RUBY_VERSION && \
+    ./configure --disable-install-doc && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -r ruby-$RUBY_VERSION ruby-$RUBY_VERSION.tar.gz && \
+    echo 'gem: --no-document' > /usr/local/etc/gemrc
+
+# ==============================================================================
+# Rubygems and Bundler
+# ==============================================================================
+
+ENV RUBYGEMS_MAJOR 2.6
+ENV RUBYGEMS_VERSION 2.6.12
+
+# Install rubygems and bundler
+ADD http://production.cf.rubygems.org/rubygems/rubygems-$RUBYGEMS_VERSION.tgz /tmp/
+RUN cd /tmp && \
+    tar -zxf /tmp/rubygems-$RUBYGEMS_VERSION.tgz && \
+    cd /tmp/rubygems-$RUBYGEMS_VERSION && \
+    ruby setup.rb && \
+    /bin/bash -l -c 'gem install bundler --no-rdoc --no-ri' && \
+    echo "gem: --no-ri --no-rdoc" > ~/.gemrc
+
+# Define working directory
+WORKDIR /app
+
+# Set bash as a default process
+CMD ["bash"]
diff --git a/Makefile b/Makefile
index fb81f4b..e00721d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # `adocker` is alias to `azk docker`
 all:
 	# latest
-	adocker build -t azukiapp/ruby           ./2.2
+	adocker build -t azukiapp/ruby           ./2.4
 
 	# version tagged
 	adocker build -t azukiapp/ruby:1.9       ./1.9
@@ -9,10 +9,11 @@ all:
 	adocker build -t azukiapp/ruby:2.1       ./2.1
 	adocker build -t azukiapp/ruby:2.2       ./2.2
 	adocker build -t azukiapp/ruby:2.3       ./2.3
+	adocker build -t azukiapp/ruby:2.4       ./2.4
 
 --no-cache:
 	# latest
-	adocker build --rm --no-cache -t azukiapp/ruby           ./2.3
+	adocker build --rm --no-cache -t azukiapp/ruby           ./2.4
 
 	# version tagged
 	adocker build --rm --no-cache -t azukiapp/ruby:1.9       ./1.9
@@ -20,3 +21,4 @@ all:
 	adocker build --rm --no-cache -t azukiapp/ruby:2.1       ./2.1
 	adocker build --rm --no-cache -t azukiapp/ruby:2.2       ./2.2
 	adocker build --rm --no-cache -t azukiapp/ruby:2.3       ./2.3
+	adocker build --rm --no-cache -t azukiapp/ruby:2.4       ./2.4
diff --git a/README.md b/README.md
index 1e1b8e8..d999d91 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ Versions (tags)
 ---
 
 <versions>
-- [`latest`, `2`, `2.3`, `2.3.1`](https://github.com/azukiapp/docker-ruby/blob/master/2.3/Dockerfile)
+- [`latest`, `2`, `2.4`, `2.4.1`](https://github.com/azukiapp/docker-ruby/blob/master/2.4/Dockerfile)
+- [`2.3`, `2.3.1`](https://github.com/azukiapp/docker-ruby/blob/master/2.3/Dockerfile)
 - [`2.2`, `2.2.6`](https://github.com/azukiapp/docker-ruby/blob/master/2.2/Dockerfile)
 - [`2.2-node12`](https://github.com/azukiapp/docker-ruby/blob/master/2.2-node12/Dockerfile)
 - [`2.2.5`](https://github.com/azukiapp/docker-ruby/blob/2.2.5/Dockerfile)
@@ -88,7 +89,7 @@ systems({
 To create the image `azukiapp/ruby`, execute the following command on the docker-ruby folder:
 
 ```sh
-$ docker build -t azukiapp/ruby 2.3/
+$ docker build -t azukiapp/ruby 2.4/
 ```
 
 To run the image and bind to port 3000:
@@ -113,4 +114,3 @@ $ docker logs <CONTAINER_ID>
 Azuki Dockerfiles distributed under the [Apache License][license].
 
 [license]: ./LICENSE
-