Skip to content

Commit

Permalink
lock factory_bot version, fix docker compose for M1 mac
Browse files Browse the repository at this point in the history
  • Loading branch information
nevinsm committed May 31, 2024
1 parent c2d41ad commit 9b11f6b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .docker-config/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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!
Expand All @@ -417,4 +418,4 @@ RUBY VERSION
ruby 2.7.2p137

BUNDLED WITH
2.1.4
2.4.13
4 changes: 2 additions & 2 deletions bin/spring
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/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)
require 'rubygems'
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
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
POSTGRES_DB: adventure-time_development

app:
platform: linux/x86_64
image: storyboard_app
build:
context: .
Expand Down Expand Up @@ -38,6 +39,7 @@ services:
stdin_open: true

webpack:
platform: linux/x86_64
image: storyboard_app
command: [
"./.docker-config/wait-for-it.sh",
Expand Down

0 comments on commit 9b11f6b

Please sign in to comment.