Skip to content

Commit 9b11f6b

Browse files
committed
lock factory_bot version, fix docker compose for M1 mac
1 parent c2d41ad commit 9b11f6b

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Diff for: .docker-config/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66
rm -rf /usr/src/app/tmp/pids
77

88
# Verify node_modules are up to date
9-
# yarn install --silent
9+
yarn install --silent
1010

1111
# Verify gems are up to date
1212
if ! bundle check > /dev/null; then

Diff for: Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ group :test do
4343
gem 'capybara', '>= 2.15'
4444
gem 'database_cleaner', '~> 0.9.1'
4545
gem "factory_bot_rails"
46+
gem 'factory_bot', '6.4.4'
4647
gem 'selenium-webdriver'
4748
gem 'simplecov', require: false
4849
gem 'webdrivers', '< 4.1'

Diff for: Gemfile.lock

+3-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ GEM
135135
ffi (>= 1.15.0)
136136
excon (0.110.0)
137137
execjs (2.9.1)
138-
factory_bot (6.4.5)
138+
factory_bot (6.4.4)
139139
activesupport (>= 5.0.0)
140140
factory_bot_rails (6.4.3)
141141
factory_bot (~> 6.4)
@@ -392,6 +392,7 @@ DEPENDENCIES
392392
devise
393393
dragonfly
394394
dragonfly-s3_data_store
395+
factory_bot (= 6.4.4)
395396
factory_bot_rails
396397
listen (>= 3.0.5, < 3.2)
397398
mimemagic!
@@ -417,4 +418,4 @@ RUBY VERSION
417418
ruby 2.7.2p137
418419

419420
BUNDLED WITH
420-
2.1.4
421+
2.4.13

Diff for: bin/spring

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/usr/bin/env ruby
22

3-
# This file loads spring without using Bundler, in order to be fast.
3+
# This file loads Spring without using Bundler, in order to be fast.
44
# It gets overwritten when you run the `spring binstub` command.
55

66
unless defined?(Spring)
77
require 'rubygems'
88
require 'bundler'
99

1010
lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
11-
spring = lockfile.specs.detect { |spec| spec.name == "spring" }
11+
spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
1212
if spring
1313
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
1414
gem 'spring', spring.version

Diff for: docker-compose.yml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
POSTGRES_DB: adventure-time_development
1212

1313
app:
14+
platform: linux/x86_64
1415
image: storyboard_app
1516
build:
1617
context: .
@@ -38,6 +39,7 @@ services:
3839
stdin_open: true
3940

4041
webpack:
42+
platform: linux/x86_64
4143
image: storyboard_app
4244
command: [
4345
"./.docker-config/wait-for-it.sh",

0 commit comments

Comments
 (0)