Staging

.dockerignore

@@ -0,0 +1,8 @@
+.bundle
+.circleci
+.git
+vendor/bundle
+log/*
+!/log/.keep
+tmp/*
+!/tmp/.keep

.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.0

Dockerfile

@@ -1,18 +1,20 @@
-FROM ruby:2.6.3
+FROM ruby:2.7.1
 
-LABEL MAINTAINER Jihane Najdi <[email protected]>
+MAINTAINER Jihane Najdi <[email protected]>
 
 # Default environment
 ARG RAILS_ENV='development'
-ARG BASEDIR='/code-workout/'
+# Ruby changed the way optional params are done, but Rails hasn't caught up
+ARG RUBYOPT='-W:no-deprecated'
+ARG BASEDIR='/code-workout'
 
 ENV TZ=America/New_York
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 #install 'development tools' build-essential  dkms curl libxslt-dev libpq-dev python-dev python-pip python-feedvalidator python-software-properties python-sphinx libmariadbclient-dev libcurl4-gnutls-dev libevent-dev libffi-dev libssl-dev stunnel4 libsqlite3-dev
 #    libmariadbclient-dev
 RUN apt-get update -qq \
-    && apt-get install -y \
+    && apt-get install -y --fix-missing \
       apt-utils \
       build-essential \
       libpq-dev \
@@ -40,30 +42,27 @@ RUN apt-get update -qq \
       python-feedvalidator \
       python-sphinx \
       ant \
+      default-jre \
+      default-jdk \
     && pip install --upgrade pip
 
 ## JAVA INSTALLATION
 RUN apt-get install -y default-jre default-jdk
 
 # install rubygems
-ENV GEM_HOME /usr/local/bundle
-ENV PATH $GEM_HOME/bin:$PATH
-ENV BUNDLER_VERSION 1.17.3 
+ENV BUNDLER_VERSION 2.1.4
 ENV RAILS_ENV=$RAILS_ENV
 
-RUN gem install bundler -v $BUNDLER_VERSION \
-	&& bundle config --global path "$GEM_HOME" \
-	&& bundle config --global bin "$GEM_HOME/bin" \
-	&& bundle config git.allow_insecure true
-
-COPY Gemfile Gemfile
-COPY Gemfile.lock Gemfile.lock
-
-RUN bundle install
+RUN gem install bundler -v $BUNDLER_VERSION
 
 VOLUME ${BASEDIR}
 WORKDIR ${BASEDIR}
 
+COPY Gemfile ${BASEDIR}/Gemfile
+COPY Gemfile.lock ${BASEDIR}/Gemfile.lock
+
+RUN bundle install
+
 COPY runservers.sh runservers.sh
 
 RUN find /code-workout -type d -exec chmod 2775 {} \;

Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2'
-gem 'bootstrap-sass-backport', '~> 3.2.0'
+gem 'rails', '~> 5.1'
+gem 'sprockets', '< 4.0.0'
+gem 'bootstrap-sass', '~> 3.2.0'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'bootstrap-editable-rails'
@@ -12,7 +13,7 @@ gem 'formtastic-bootstrap'
 gem 'sucker_punch', '~> 1.0'
 gem 'haml', '>= 3.1.4'
 gem 'haml-rails'
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.2'
 gem 'coffee-script-source'
 gem 'test-unit', '~> 3.0.9'
 gem 'nokogiri', '~> 1.10.4'
@@ -26,12 +27,15 @@ gem 'acts-as-taggable-on'
 gem 'representable', '~> 2.1'
 gem 'redcarpet'
 gem 'loofah', '>= 2.3.1'
+gem 'peml', github: 'CSSPLICE/peml'
 gem 'truncate_html'
 gem 'tzinfo' # For timezone support
 gem 'active_record_union'
+gem 'dottie', '~> 0.0.1'
 gem 'mysql2', '~> 0.4.0'
 gem 'modernizr-rails'
 gem 'rubyzip', '>= 1.3.0'
+gem 'bootsnap' # Added during Rails 5.2 upgrade
 
 # For JSON support
 gem 'rabl'
@@ -48,22 +52,19 @@ group :development, :test do
   gem 'thin'
   gem 'byebug'
   gem 'sqlite3', '~> 1.3.0'
+  gem 'listen'
   gem 'rspec-rails'
   gem 'annotate'
   gem 'rails-erd', git: 'https://github.com/voormedia/rails-erd'
   gem 'faker'
-  # Needed for debugging support in Aptana Studio.  Disabled, since these
-  # two gems do not support Ruby 2.0 yet :-(.
-  # gem 'ruby-debug-base'
-  # gem 'ruby-debug-ide'
   gem 'pry'
   gem 'request-log-analyzer'
+  gem 'capybara', '~> 3.12.0'
 end
 gem 'factory_bot_rails'
 gem 'log_file'
 
 group :test do
-  gem 'capybara'
 end
 
 group :production, :staging, :deploy  do
@@ -83,7 +84,7 @@ gem 'omniauth-google-oauth2'
 gem 'omniauth-cas'
 gem 'cancancan'
 gem 'activeadmin'
-gem 'exception_handler', '= 0.3.45'
+gem 'exception_handler', '~> 0.8.0.0'
 
 gem 'kaminari', '~> 1.2.1'        # Auto-paginated views
 gem 'remotipart'      # Adds support for remote mulitpart forms (file uploads)
@@ -98,9 +99,6 @@ gem 'bootstrap-wysihtml5-rails'
 gem 'momentjs-rails', '>= 2.9.0'
 gem 'bootstrap3-datetimepicker-rails', '~> 4.17.37'
 
-#gem for improved WHERE querying
-gem 'squeel', '~> 1.2'
-
 #for nested forms
 gem 'cocoon'
 
@@ -128,7 +126,6 @@ gem 'rest-client'
 # Gems for cookie updates
 gem 'user_agent_parser', '~> 2.7.0'
 gem 'rails_same_site_cookie'
-gem 'sprockets', '< 4.0.0'
 gem 'image_hash'
 
 # Gems for resource uploder