From 08301e85ec6ea7807ce3ee68c961b2d51c281f7c Mon Sep 17 00:00:00 2001
From: Yorgos Saslis <yorgos.saslis@redhat.com>
Date: Wed, 10 Oct 2018 19:08:12 +0300
Subject: [PATCH 1/3] Ruby 2.5 Software Collections base image

---
 Dockerfile | 2 +-
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a29c562..f1fb226 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos/ruby-24-centos7
+FROM centos/ruby-25-centos7
 
 ENV BUNDLER_VERSION="1.17.3" \
     OPENRESTY_VERSION=1.11.2.1 \
diff --git a/Makefile b/Makefile
index ed26553..48d8516 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ build: Dockerfile
 test:
 #	docker run --user root --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep '
 #	docker run --rm $(IMAGE_NAME) sh -c 'echo $$HOME | grep /ruby'
-	docker run --rm $(IMAGE_NAME) ruby -v | grep 2.4
+	docker run --rm $(IMAGE_NAME) ruby -v | grep 2.5
 	docker run --rm $(IMAGE_NAME) node -v
 	docker run --rm $(IMAGE_NAME) bundle -v
 	docker run --rm $(IMAGE_NAME) sh -c 'sudo ls -al /root'

From bc66d979af67f27dd3d77e0e27432c5744f9c4d1 Mon Sep 17 00:00:00 2001
From: Carlos Ribeiro <mail@carlosribeiro.me>
Date: Thu, 9 Jan 2020 13:12:17 -0300
Subject: [PATCH 2/3] Install file command from yum

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index f1fb226..6194265 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN yum install -y git \
                    make \
                    sudo \
                    rh-nodejs8 \
+                   file \
  && echo 'default        ALL=(ALL)       NOPASSWD: ALL' >> /etc/sudoers
 
 RUN echo --color > ~/.rspec \

From 2dfe219aa2f75be1172962479e20ed597759d25f Mon Sep 17 00:00:00 2001
From: Hallelujah <hery@rails-royce.org>
Date: Thu, 16 Jan 2020 20:08:34 +0100
Subject: [PATCH 3/3] [Dockerfile] Do not set RAILS_ENV and remove CMD

We should not set RAILS_ENV as it is persisted in all layers
Making it hard to use the system-builder for community image

Also remove CMD as the script/jenkins.sh does not exist anymore
---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6194265..1f64cb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ ARG DB=mysql
 ENV PATH="./node_modules/.bin:$PATH:/usr/local/nginx/sbin/:/usr/local/luajit/bin/" \
     DISPLAY=:99.0 \
     SKIP_ASSETS="1" \
-    RAILS_ENV=test \
     TZ=:/etc/localtime \
     LD_LIBRARY_PATH=/opt/oracle/instantclient_12_2/ \
     ORACLE_HOME=/opt/oracle/instantclient_12_2/ \
@@ -110,5 +109,3 @@ VOLUME [ "/opt/system/tmp/cache/", \
 USER default
 
 ENTRYPOINT ["container-entrypoint"]
-
-CMD ["script/jenkins.sh"]