Merge branch 'development'

.circleci/config.yml

@@ -3,19 +3,19 @@ version: 2
 defaults: &defaults
   working_directory: ~/circleci-champaign
   docker:
-    - image: soutech/ruby2.4.1_node_awscli:0.2
+    - image: soutech/ruby2.4.5_node_awscli:latest
 
 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: gem-cache-{{ checksum "Gemfile.lock" }}
+      # - restore_cache:
+      #     name: Restoring node_modules cache
+      #     key: yarn-cache-{{ checksum "yarn.lock" }}
       - run:
           name: Install gems
           command: bundle install --path vendor/bundle
@@ -107,7 +107,7 @@ jobs:
   rspec:
     working_directory: ~/circleci-champaign
     docker:
-      - image: soutech/ruby2.4.1_node_awscli:0.2
+      - image: soutech/ruby2.4.5_node_awscli:latest
         environment:
           PG_USERNAME: champaign
           PG_PASSWORD: champaign

.dockerignore

@@ -5,3 +5,7 @@
 log
 node_modules
 vendor/bundle
+log/*.log
+tmp/cache
+public/packs-test
+public/system

.ebextensions/02_container_commands.config

@@ -13,7 +13,7 @@ files:
       -e CACHE_PORT=$CACHE_PORT \
       -e EXTERNAL_ASSETS_PATH=$EXTERNAL_ASSETS_PATH \
       -e EXTERNAL_LIQUID_PATH=$EXTERNAL_LIQUID_PATH \
-      aws_beanstalk/staging-app:latest rake db:migrate champaign:seed_liquid
+      aws_beanstalk/staging-app:latest bundle exec rake db:migrate champaign:seed_liquid
   "/home/ec2-user/docker-housekeeping.sh":
     mode: "000755"
     owner: root

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.5

Dockerfile

@@ -1,20 +1,22 @@
-FROM ruby:2.4.1
+FROM ruby:2.4.5-stretch
 
 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 7.x
-RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && echo 'deb https://deb.nodesource.com/node_7.x jessie main' > /etc/apt/sources.list.d/nodesource.list
+# 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

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '2.4.1'
+ruby '2.4.5'
 
 gem 'aasm'
 gem 'activeadmin'

Gemfile.lock

@@ -642,7 +642,7 @@ DEPENDENCIES
   webpacker (~> 3.5)
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.4.5p335
 
 BUNDLED WITH
-   1.17.1
+   2.0.1