From d8df859e5cc4766ba0107e17a4cb960d91c68940 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Sun, 14 Jun 2020 23:32:34 +1000
Subject: [PATCH] Update Docker setup

---
 Dockerfile         | 4 ++--
 Makefile           | 7 ++-----
 docker-compose.yml | 5 ++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 997ad584f..817e26443 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM ruby:2.5.1
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+FROM ruby:2.7.1
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
diff --git a/Makefile b/Makefile
index b64cf7c38..f63846fed 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,11 @@ help:
 	@echo
 
 # Builds intermediate files. Needs a _site built first though
-update: _site critical
+update: _site
 
 # Builds _site
 _site:
-	bundle exec jekyll build --incremental
-
-critical: _site ## Builds critical path CSS/JS
-	yarn critical
+	yarn build
 
 dev: 
 	yarn dev
diff --git a/docker-compose.yml b/docker-compose.yml
index d783fea59..5a73e73ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,14 @@ services:
       - .:/app
       - rubygems:/usr/local/bundle
       - ./node_modules:/app/node_modules
+      - yarn_cache:/root/.cache/yarn
     ports:
       - '4001:4001'
       - '35729:35729'
-    command: 'env PORT=4001 HOST=0.0.0.0 yarn run dev'
+    command: >
+      bash -c 'yarn; bundle; env PORT=4001 HOST=0.0.0.0 yarn run dev'
 
 volumes:
   rubygems:
   node_modules:
+  yarn_cache: