diff --git a/Gemfile b/Gemfile index 9b35f485e..f2bd1d83c 100755 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ group :development, :test do gem 'bullet' gem 'byebug' gem 'memory_profiler' - gem 'rack-mini-profiler' + gem 'rack-mini-profiler', git: 'https://github.com/epugh/rack-mini-profiler', branch: 'remove_old_css' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index f8923eb6d..9e52ff7cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/epugh/rack-mini-profiler + revision: 4e440c08e4d73193152d8d8cf7282ef290edf6ad + branch: remove_old_css + specs: + rack-mini-profiler (2.3.2) + rack (>= 1.2.0) + GEM remote: https://rubygems.org/ specs: @@ -253,8 +261,6 @@ GEM rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) - rack-mini-profiler (2.3.2) - rack (>= 1.2.0) rack-protection (2.1.0) rack rack-proxy (0.7.0) @@ -421,7 +427,7 @@ DEPENDENCIES puma_worker_killer pundit rack-cors (~> 1.1) - rack-mini-profiler + rack-mini-profiler! rails (= 6.1.4) rails-controller-testing rails-erd (~> 1.6) diff --git a/bin/setup_docker b/bin/setup_docker index 60ab6cdc6..0db7feff5 100755 --- a/bin/setup_docker +++ b/bin/setup_docker @@ -30,6 +30,7 @@ Dir.chdir APP_ROOT do puts "\n== Building Docker container ==" system "docker-compose up #{build_arg} --no-start" + system "bin/docker r bundle install" system "bin/docker r yarn" system "bin/docker r ./wait-for mysql:3306 -- bin/rake db:setup" system "bin/docker r ./wait-for mysql:3306 -- bin/rake db:create RAILS_ENV=test"