Commit ddb78a1

@@ -5,15 +5,13 @@
 set -e
 cd "$(dirname "$0")/.."
 
-if [ ! "$RAILS_ENV" = "production" ] ; then
-  PROCFILE=Procfile.development
-  bin/webpack
-else
-  PROCFILE=Procfile
-fi
+PORT=${PORT:=3000}
+PROCFILE=Procfile
+
+export PORT
+
 test -z "$RACK_ENV" && RACK_ENV='development'
-if [ -n "$1" ]; then
-  bundle exec foreman start "$1" -f $PROCFILE
-else
-  bundle exec foreman start -f $PROCFILE
-fi
+bin/update
+
+gem install foreman
+foreman start -e /dev/null -f $PROCFILE

@@ -12,7 +12,6 @@ gem 'dotenv', '~> 2.5'
 gem 'email_validator', '~> 1.6'
 gem 'flipper', '~> 0.16'
 gem 'flipper-active_record', '~> 0.16'
-gem 'foreman', '~> 0.85'
 gem 'jbuilder', '~> 2.5'
 gem 'jwt', '~> 2.1'
 gem 'local_time', '~> 2.1'

@@ -101,8 +101,6 @@ GEM
     flipper-active_record (0.16.0)
       activerecord (>= 3.2, < 6)
       flipper (~> 0.16.0)
-    foreman (0.85.0)
-      thor (~> 0.19.1)
     forwardable-extended (2.6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
@@ -339,7 +337,6 @@ DEPENDENCIES
   ffaker (~> 2.10)
   flipper (~> 0.16)
   flipper-active_record (~> 0.16)
-  foreman (~> 0.85)
   i18n-tasks (~> 0.9.24)
   jbuilder (~> 2.5)
   jekyll (~> 3.8)
@@ -369,4 +366,4 @@ RUBY VERSION
    ruby 2.5.3p105
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

@@ -1,1 +1,1 @@
-web: bundle exec puma -C config/puma.rb
+web: bundle exec rails s -p $PORT

@@ -1,2 +0,0 @@
-web: bin/rails s -p $PORT
-webpack: ./bin/webpack-dev-server