Merge branch 'develop' of github.com:code-and-effect/effective_website into develop

Author: matt-riemer

.gitignore

@@ -44,3 +44,8 @@ test/tours/*.gif
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+
+/config/master.key
+
+# RubeMine
+.idea

Dockerfile

@@ -1,7 +1,11 @@
 FROM ruby:2.7.1
 
 # Install 3rd party dependencies.
-RUN apt update && apt -y install nodejs
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt update && \
+    apt -y install nodejs \
+    yarn
 
 # Working directory.
 RUN mkdir /app

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     volumes:
       - .:/app
       - bundle-volume:/usr/local/bundle
+      - yarn-volume:/app/node_modules
     ports:
       - "3000:3000"
       #- "1234:1234" # RubyMine
@@ -23,4 +24,5 @@ services:
 
 volumes:
   bundle-volume:
+  yarn-volume:
   db-volume:

docker-entrypoint.sh

@@ -1,11 +1,9 @@
-#!/bin/sh
+#!/bin/bash
+
 set -e
 
-# For development check if the gems as installed, if not
-# then install them.
-if ! [ bundle check ]; then
-  bundle install
-fi
+bundle install
+yarn install --check-files --frozen-lockfile
 
 # Remove a potentially pre-existing server.pid for Rails.
 rm -f /app/tmp/pids/server.pid