Fix build issue on M1 macOS

Dockerfile

@@ -6,7 +6,7 @@ RUN curl https://deb.nodesource.com/setup_12.x | bash
 RUN cat pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
-    && apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs yarn libvips-dev
+    && apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs python2 yarn libvips-dev
 RUN bundle config set force_ruby_platform true
 
 ENV LANG C.UTF-8

Gemfile

@@ -102,6 +102,7 @@ gem "memory_profiler"
 gem "rack-mini-profiler"
 
 # server/environment
+gem "ffi"
 gem "puma"
 gem "rails", "~> 6.0"
 # see https://github.com/faye/websocket-driver-ruby/issues/58#issuecomment-394611125

Gemfile.lock

@@ -194,7 +194,7 @@ GEM
       railties (>= 4.2.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.5)
+    ffi (1.17.0)
     font-awesome-sass (5.13.0)
       sassc (>= 1.11)
     friendly_uuid (0.3.0)
@@ -534,6 +534,7 @@ DEPENDENCIES
   descriptive_statistics
   doorkeeper
   factory_bot_rails
+  ffi
   font-awesome-sass (~> 5.9)
   friendly_uuid
   gon

Makefile

@@ -26,7 +26,7 @@ container ?= web
 
 build:
 	$(docker-compose) build web
-	$(docker-compose) run --rm web bash -c 'bundle install --jobs $$((`nproc` - 1)) && yarn install && rails db:migrate && skylight disable_dev_warning'
+	$(docker-compose) run --rm web bash -c 'gem install bundler:2.2.15 && bundle update --bundler && bundle install --jobs $$((`nproc` - 1)) && yarn install && rails db:migrate && skylight disable_dev_warning'
 	@[ -e tmp/seed ] || make seed
 	$(docker-compose) stop
 

README.md

@@ -22,6 +22,7 @@
 </p>
 
 ## About
+
 Splits.io is how speedrunners improve through data. It gives split-by-split
 analysis of individual runs, viewed through a lens of all runs. On Splits.io,
 speedrunners share more than their time—they share their entire history of
@@ -108,10 +109,12 @@ make build
 ```
 
 #### Further Setup
+
 These steps are not required for normal operation, but you may want to
 perform them for specific categories of work.
 
 ##### OAuth
+
 Some features are built on top of links with other platforms, like Twitch
 sign-in. If you want these features to work, you need to register developer
 applications with the appropriate services. Copy `.envrc.example` to `.envrc`