From 9b11f6b3945fc0b6e2adc26283aa059ab63b14a6 Mon Sep 17 00:00:00 2001
From: Nevin Morgan <nevin@longtowel.com>
Date: Fri, 31 May 2024 17:56:33 -0400
Subject: [PATCH] lock factory_bot version, fix docker compose for M1 mac

---
 .docker-config/entrypoint.sh | 2 +-
 Gemfile                      | 1 +
 Gemfile.lock                 | 5 +++--
 bin/spring                   | 4 ++--
 docker-compose.yml           | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.docker-config/entrypoint.sh b/.docker-config/entrypoint.sh
index 1320117..fe905ab 100755
--- a/.docker-config/entrypoint.sh
+++ b/.docker-config/entrypoint.sh
@@ -6,7 +6,7 @@ set -e
 rm -rf /usr/src/app/tmp/pids
 
 # Verify node_modules are up to date
-# yarn install --silent
+yarn install --silent
 
 # Verify gems are up to date
 if ! bundle check > /dev/null; then
diff --git a/Gemfile b/Gemfile
index 45f5f17..39248b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,6 +43,7 @@ group :test do
   gem 'capybara', '>= 2.15'
   gem 'database_cleaner',   '~> 0.9.1'
   gem "factory_bot_rails"
+  gem 'factory_bot', '6.4.4'
   gem 'selenium-webdriver'
   gem 'simplecov', require: false
   gem 'webdrivers', '< 4.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 17fcbd3..46cd81b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
       ffi (>= 1.15.0)
     excon (0.110.0)
     execjs (2.9.1)
-    factory_bot (6.4.5)
+    factory_bot (6.4.4)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
@@ -392,6 +392,7 @@ DEPENDENCIES
   devise
   dragonfly
   dragonfly-s3_data_store
+  factory_bot (= 6.4.4)
   factory_bot_rails
   listen (>= 3.0.5, < 3.2)
   mimemagic!
@@ -417,4 +418,4 @@ RUBY VERSION
    ruby 2.7.2p137
 
 BUNDLED WITH
-   2.1.4
+   2.4.13
diff --git a/bin/spring b/bin/spring
index fb2ec2e..d89ee49 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast.
+# This file loads Spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
@@ -8,7 +8,7 @@ unless defined?(Spring)
   require 'bundler'
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem 'spring', spring.version
diff --git a/docker-compose.yml b/docker-compose.yml
index c5b82c2..4176a8d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       POSTGRES_DB: adventure-time_development
 
   app:
+    platform: linux/x86_64
     image: storyboard_app
     build:
       context: .
@@ -38,6 +39,7 @@ services:
     stdin_open: true
 
   webpack:
+    platform: linux/x86_64
     image: storyboard_app
     command: [
       "./.docker-config/wait-for-it.sh",