Merge pull request #1371 from SumOfUs/development

Release

.circleci/config.yml

@@ -3,19 +3,19 @@ version: 2
 defaults: &defaults
   working_directory: ~/circleci-champaign
   docker:
-    - image: soutech/ruby2.4.5_node_awscli:latest
+    - image: soutech/ruby:2.6-stretch-node-awscli
 
 jobs:
   install_dependencies:
     <<: *defaults
     steps:
       - checkout
-      # - restore_cache:
-      #     name: Restoring bundler cache
-      #     key: gem-cache-{{ checksum "Gemfile.lock" }}
-      # - restore_cache:
-      #     name: Restoring node_modules cache
-      #     key: yarn-cache-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          name: Restoring bundler cache
+          key: gems-{{ checksum "Gemfile.lock" }}
+      - restore_cache:
+          name: Restoring node_modules cache
+          key: node-{{ checksum "yarn.lock" }}
       - run:
           name: Install gems
           command: bundle install --path vendor/bundle
@@ -27,11 +27,11 @@ jobs:
           name: Download external assets
           command: bundle exec rake assets:download_external_assets[$EXTERNAL_ASSETS_PATH,$CUSTOM_ASSETS_URL,$CUSTOM_ASSETS_CREDENTIALS,$CIRCLE_BRANCH]
       - save_cache:
-          key: gem-cache-{{ checksum "Gemfile.lock" }}
+          key: gems-{{ checksum "Gemfile.lock" }}
           paths:
           - vendor/bundle
       - save_cache:
-          key: yarn-cache-{{ checksum "yarn.lock" }}
+          key: node-{{ checksum "yarn.lock" }}
           paths:
           - node_modules
       - persist_to_workspace:
@@ -107,7 +107,7 @@ jobs:
   rspec:
     working_directory: ~/circleci-champaign
     docker:
-      - image: soutech/ruby2.4.5_node_awscli:latest
+      - image: soutech/ruby:2.6-stretch-node-awscli
         environment:
           PG_USERNAME: champaign
           PG_PASSWORD: champaign

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   Exclude:
     - 'bin/**/*'
     - 'vendor/**/*'
@@ -46,7 +46,7 @@ Naming/VariableNumber:
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
-  
+
 Lint/HandleExceptions:
   Enabled: false
 

.ruby-version

@@ -1 +1 @@
-2.4.5
+2.6.2

Dockerfile

@@ -1,22 +1,11 @@
-FROM ruby:2.4.5-stretch
+FROM soutech/ruby:2.6-alpine-node
 
 ENV APP_ROOT /champaign
 
-# Install ImageMagick and apt-transport-https (to install nodesource)
-RUN apt-get update -qq && apt-get install -y apt-transport-https imagemagick
-
-# Install Node.js 11.x
-RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - \
-  && apt-get install -y nodejs
-
-RUN apt-get update -qq && apt-get install -y nodejs
-
-# Create app folder and add current dir contents
 RUN mkdir $APP_ROOT
 ADD . $APP_ROOT
 WORKDIR $APP_ROOT
 
-RUN gem install bundler
 RUN bundle install --jobs 4 --deployment --without development:test:doc
 
 EXPOSE 3000

Gemfile

@@ -1,16 +1,15 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '2.4.5'
+ruby '2.6.2'
 
 gem 'aasm'
-gem 'activeadmin'
+gem 'activeadmin', '~> 1.4.3'
 gem 'bcrypt', '~> 3.1.7'
-gem 'braintree', '~> 2.54.0'
+gem 'braintree', '~> 2'
 gem 'countries', require: 'countries/global'
 gem 'country_select'
-gem 'devise', '~> 4.3'
+gem 'devise', '~> 4.6'
 gem 'font-awesome-sass', '~> 4.7.0'
 gem 'geocoder'
 gem 'gocardless_pro'
@@ -36,10 +35,10 @@ gem 'slim-rails'
 ## Use Paper Trail for containing a full history of our edits.
 gem 'action_parameter'
 gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-dynamodb', '~> 1.21'
 gem 'aws-sdk-s3', '~> 1.30'
 gem 'aws-sdk-sns', '~> 1.3'
 gem 'aws-sdk-sqs', '~> 1.10'
-gem 'aws-sdk-dynamodb', '~> 1.21'
 gem 'paper_trail', '~> 10.2'
 gem 'paperclip', '~> 6.0'
 gem 'rmagick' # rmagick for image processing
@@ -49,7 +48,7 @@ gem 'airbrake', '~> 5.7.1'
 gem 'airbrake-ruby', '1.7.1'
 gem 'aws-sdk-rails'
 gem 'bootsnap', require: false
-gem 'bootstrap-sass', '~> 3.3.5'
+gem 'bootstrap-sass', '~> 3.4.1'
 gem 'browser', '~> 2.5'
 gem 'compass-rails' # was using git master branch before
 gem 'config'
@@ -58,7 +57,7 @@ gem 'friendly_id'
 gem 'jwt'
 gem 'lograge', '~> 0.10.0'
 gem 'metamagic'
-gem 'money-oxr'
+gem 'money-oxr', '~> 0.4.1'
 gem 'newrelic_rpm'
 gem 'puma', '~> 3.12.0'
 gem 'sass-rails'
@@ -71,16 +70,16 @@ gem 'uglifier'
 gem 'webpacker', '~> 3.5'
 
 group :development, :test do
+  gem 'byebug'
   gem 'capybara' # Capybara for integration testing
   gem 'database_cleaner'
   gem 'factory_bot_rails'
   gem 'faker'
   gem 'magic_lamp'
   gem 'rspec-rails', '~> 3.8'
-  gem 'rubocop', require: false
+  gem 'rubocop', '~> 0.66', require: false
   gem 'spring-commands-rspec'
   gem 'vcr'
-  gem 'byebug'
 end
 
 group :development do
@@ -96,7 +95,7 @@ group :test do
   gem 'poltergeist'
   gem 'rails-controller-testing'
   gem 'rspec-json_expectations'
+  gem 'rubocop-rspec'
   gem 'timecop'
   gem 'webmock'
-  gem 'rubocop-rspec'
 end