Merge pull request #663 from Fryguy/rails6_ruby27

Upgrade to Rails 6.1 / Ruby 2.7

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '2.6'
+        - '2.7'
     services:
       postgres:
         image: manageiq/postgresql:13
@@ -47,6 +47,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.6' }}
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' }}
       continue-on-error: true
       uses: paambaati/codeclimate-action@v5

.gitignore

@@ -39,5 +39,4 @@
 # Ignore local seeds file
 db/seeds.local.rb
 
-# Ignore vagrant configuration/runtime files
-.vagrant/
+/config/master.key

Dockerfile

@@ -15,16 +15,16 @@ LABEL name="miq-bot" \
       io.k8s.description="ManageIQ Bot is a developer automation tool." \
       io.openshift.tags="ManageIQ,miq-bot"
 
-RUN curl -L -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_x86_64 && \
+RUN curl -L -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 && \
     chmod +x /usr/bin/dumb-init
 
 RUN dnf config-manager --setopt=ubi-8-*.exclude=net-snmp*,dracut*,libcom_err*,python3-gobject*,redhat-release* --save && \
     dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install \
       http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-8-2.el8.noarch.rpm \
       http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-8-2.el8.noarch.rpm \
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
-    dnf -y --disableplugin=subscription-manager module enable nodejs:12 && \
-    dnf -y --disableplugin=subscription-manager module enable ruby:2.6 && \
+    dnf -y --disableplugin=subscription-manager module enable nodejs:18 && \
+    dnf -y --disableplugin=subscription-manager module enable ruby:2.7 && \
     dnf clean all && \
     rm -rf /var/cache/dnf
 
@@ -63,7 +63,7 @@ RUN mkdir -p $APP_ROOT && \
 WORKDIR $APP_ROOT
 
 RUN echo "gem: --no-document" > ~/.gemrc && \
-    gem install bundler -v 2.3.18 && \
+    gem install bundler && \
     bundle config set --local build.rugged --with-ssh && \
     bundle install --jobs=3 --retry=3 && \
     # Clean up all the things

Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.8', '>= 5.2.8.1'
+gem 'rails', '~> 6.1.0', '>= 6.1.7.6'
 
 # Use PostgreSQL as the database for Active Record
 gem 'pg'
@@ -15,31 +14,26 @@ gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
 
-gem 'thin'
-gem 'foreman', '~> 0.64.0' # v0.65.0 breaks support for the older upstart on RHEL 6
+gem 'foreman'
+gem 'puma'
 
 gem 'config'
 gem 'listen'
 
 # Sidekiq specific gems
-gem 'celluloid', '~> 0.17.4', :require => false
 gem 'sidecloq'
-gem 'sidekiq', '~> 5.2.10'
-gem 'sinatra', :require => false
-gem 'slim'
+gem 'sidekiq'
 
 # Services gems
-gem 'minigit',        '~> 0.0.4'
-gem 'net-ssh',        '~> 4.2.0'
-
-gem 'awesome_spawn',        '>= 1.4.1'
-gem 'default_value_for',    '>= 3.1.0'
-gem 'haml',                 '~> 5.1',    :require => false # force newer version of haml
-gem 'haml_lint',            '~> 0.35.0', :require => false
-gem 'manageiq-style',                    :require => false
-gem 'more_core_extensions', '~> 4.0.0',  :require => 'more_core_extensions/all'
-gem 'sync',                              :require => false # required by more_core_extensions
-gem 'rugged',                            :require => false
+gem 'minigit', '~> 0.0.4'
+gem 'net-ssh', '~> 7.2.0'
+
+gem 'awesome_spawn',        '~> 1.6'
+gem 'default_value_for',    '~> 3.4'
+gem 'haml_lint',            '~> 0.51', :require => false
+gem 'manageiq-style',       '>= 1.4',  :require => false
+gem 'more_core_extensions', '~> 4.4',  :require => 'more_core_extensions/all'
+gem 'rugged',                          :require => false
 
 gem 'octokit', '~> 4.8.0', :require => false
 gem 'faraday', '~> 0.9.2'