Dockerizes CVM

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.5-stretch
+      - image: circleci/ruby:2.5.1
     working_directory: ~/app
     steps:
       - run:

.env

@@ -0,0 +1 @@
+RAILS_ENV=development

.gitignore

@@ -18,9 +18,6 @@
 /log/*.log.*
 /tmp
 
-# Ignore dotenv
-.env
-
 # Ignore coverage
 /coverage
 
@@ -37,3 +34,5 @@ blazegraph*
 public/ns*
 
 .vscode/*
+
+sunspot-solr.pid

Dockerfile

@@ -0,0 +1,38 @@
+FROM ruby:2.5.1 as builder
+
+# Necessary for bundler to properly install some gems
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+RUN gem install bundler
+
+RUN apt-get update -qq && apt-get upgrade -y && \
+  apt-get install -y build-essential libpq-dev mysql-client cmake libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev phantomjs && \
+  apt-get install -y openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless && \
+  update-alternatives --config java
+
+RUN wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+RUN tar xvjf phantomjs-2.1.1-linux-x86_64.tar.bz2 -C /usr/local/share/
+RUN ln -sf /usr/local/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin
+
+RUN mkdir /data
+WORKDIR /data
+
+ADD Gemfile /data/Gemfile
+ADD Gemfile.lock /data/Gemfile.lock
+RUN mkdir /data/build
+
+ARG RAILS_ENV=development
+ENV RAILS_ENV=${RAILS_ENV}
+
+ADD ./build/install_gems.sh /data/build
+RUN ./build/install_gems.sh
+
+ADD . /data
+
+FROM builder
+
+RUN if [ "${RAILS_ENV}" = "production" ]; then \
+  echo "Precompiling assets with $RAILS_ENV environment"; \
+  RAILS_ENV=$RAILS_ENV SECRET_KEY_BASE=temporary bundle exec rails assets:precompile; \
+  fi

Gemfile

@@ -9,7 +9,7 @@ gem 'actionpack-page_caching'
 gem 'sqlite3', '~> 1.3.13'
 gem 'mysql2', '~> 0.3.13'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails'
 # Use Bootstrap
 gem 'bootstrap-sass', '~> 3.4'
 gem 'autoprefixer-rails'
@@ -62,7 +62,12 @@ gem 'font-awesome-rails'
 
 gem 'attr_extras'
 
-gem 'capistrano', '~> 2.0'
+gem 'capistrano', '~> 3.0'
+gem 'capistrano-passenger'
+gem 'capistrano-rails'
+gem 'capistrano-rbenv'
+gem 'capistrano3-puma'
+gem 'puma'
 
 gem 'responders', '~> 2.0'
 

Gemfile.lock

@@ -66,10 +66,12 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
+    airbrussh (1.3.2)
+      sshkit (>= 1.6.1, != 1.7.0)
     arel (6.0.4)
     ast (2.4.0)
     attr_extras (6.2.1)
-    autoprefixer-rails (9.6.0)
+    autoprefixer-rails (9.6.1)
       execjs
     awesome_print (1.8.0)
     bcp47 (0.3.3)
@@ -86,12 +88,25 @@ GEM
     builder (3.2.3)
     byebug (11.0.1)
     cancan (1.6.10)
-    capistrano (2.15.9)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
+    capistrano (3.11.0)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (1.6.0)
+      capistrano (~> 3.1)
+    capistrano-passenger (0.2.0)
+      capistrano (~> 3.0)
+    capistrano-rails (1.4.0)
+      capistrano (~> 3.1)
+      capistrano-bundler (~> 1.1)
+    capistrano-rbenv (2.1.4)
+      capistrano (~> 3.1)
+      sshkit (~> 1.3)
+    capistrano3-puma (4.0.0)
+      capistrano (~> 3.7)
+      capistrano-bundler
+      puma (~> 4.0)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -112,10 +127,10 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.5)
-    config (1.7.2)
-      activesupport (>= 3.0)
+    config (2.0.0)
+      activesupport (>= 4.2)
       deep_merge (~> 1.2, >= 1.2.1)
-      dry-validation (~> 0.12, >= 0.12.2, < 1.0.0)
+      dry-schema (~> 1.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -126,7 +141,7 @@ GEM
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     database_cleaner (1.7.0)
-    ddtrace (0.24.0)
+    ddtrace (0.25.0)
       msgpack
     debug_inspector (0.0.3)
     deep_merge (1.2.1)
@@ -141,40 +156,42 @@ GEM
     diff-lcs (1.3)
     diffy (3.3.0)
     docile (1.3.2)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.2)
-    dotenv-rails (2.7.2)
-      dotenv (= 2.7.2)
+    dotenv (2.7.4)
+    dotenv-rails (2.7.4)
+      dotenv (= 2.7.4)
       railties (>= 3.2, < 6.1)
     dry-configurable (0.8.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.1)
+    dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
+    dry-core (0.4.8)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
-    dry-logic (0.6.1)
+    dry-initializer (3.0.1)
+    dry-logic (1.0.2)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.14.1)
+    dry-schema (1.3.1)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.8, >= 0.8.3)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-logic (~> 1.0)
+      dry-types (~> 1.0)
+    dry-types (1.1.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
+      dry-equalizer (~> 0.2, >= 0.2.2)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 0.5, >= 0.5)
-    dry-validation (0.13.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.5, >= 0.5.0)
-      dry-types (~> 0.14.0)
+      dry-logic (~> 1.0, >= 1.0.2)
     ebnf (1.0.0)
       rdf (~> 1.1)
       sxp (~> 0.1, >= 0.1.3)
@@ -207,8 +224,6 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashdiff (0.4.0)
-    highline (2.0.2)
-    hike (1.2.3)
     honeycomb-beeline (0.8.0)
       activerecord-honeycomb (>= 0.4.0)
       faraday-honeycomb (>= 0.3.0)
@@ -278,24 +293,21 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_racer (0.2.6)
       libv8 (>= 6.9.411)
     minitest (5.11.3)
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multipart-post (2.1.1)
     mysql2 (0.3.21)
     net-http-persistent (2.9.4)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
     net-ssh (5.2.0)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
     netrc (0.11.0)
+    nio4r (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
@@ -328,7 +340,9 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
+    puma (4.0.1)
+      nio4r (~> 2.0)
     rack (1.6.11)
     rack-honeycomb (0.5.0)
       libhoney (>= 1.5.0)
@@ -361,6 +375,9 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.0)
     rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rdf (1.99.1)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.99.0)
@@ -426,7 +443,7 @@ GEM
     rsolr (2.2.1)
       builder (>= 2.1.2)
       faraday (>= 0.9.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -455,12 +472,17 @@ GEM
     ruby-progressbar (1.10.1)
     rugged (0.28.2)
     safe_yaml (1.0.5)
-    sass (3.2.19)
-    sass-rails (4.0.5)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
@@ -498,27 +520,28 @@ GEM
     spring (2.1.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.12.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    sunspot (2.3.0)
+    sshkit (1.19.1)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+    sunspot (2.5.0)
       pr_geohash (~> 1.0)
       rsolr (>= 1.1.1, < 3)
-    sunspot_solr (2.3.0)
+    sunspot_solr (2.5.0)
     sxp (0.1.5)
     temple (0.8.1)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.9)
     timecop (0.9.1)
     tins (1.6.0)
     turbolinks (5.2.0)
@@ -573,7 +596,11 @@ DEPENDENCIES
   bootstrap-will_paginate
   brakeman
   cancan
-  capistrano (~> 2.0)
+  capistrano (~> 3.0)
+  capistrano-passenger
+  capistrano-rails
+  capistrano-rbenv
+  capistrano3-puma
   capybara
   capybara-screenshot
   coffee-rails (~> 4.0.0)
@@ -601,6 +628,7 @@ DEPENDENCIES
   pry-git
   pry-rails
   pry-remote
+  puma
   rack-honeycomb (~> 0.5.0)
   rails (~> 4.2.11.1)
   rdf-vocab
@@ -610,7 +638,7 @@ DEPENDENCIES
   rubocop
   rubocop-rspec
   rugged
-  sass-rails (~> 4.0.3)
+  sass-rails
   sdoc (~> 0.4.0)
   sequel
   shoulda-matchers
@@ -634,4 +662,4 @@ DEPENDENCIES
   will_paginate (~> 3.1.0)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

app/controllers/application_controller.rb

@@ -12,7 +12,7 @@ def skip_render_on_cached_page
     @skip_render = true
   end
 
-  if %w[production staging development].include? Rails.env
+  if %w[production staging].include? Rails.env
     def append_info_to_payload(payload)
       super(payload)
       Rack::Honeycomb.add_field(request.env, 'classname', self.class.name)