diff --git a/Dockerfile.frontend b/Dockerfile.frontend index 801810af99d2198b561b572546276fcbba1d2066..044caa608c82cffaf14310b6c044088702373457 100644 --- a/Dockerfile.frontend +++ b/Dockerfile.frontend @@ -15,12 +15,6 @@ RUN mkdir -p log tmp db/sphinx \ ADD --chown=frontend:frontend src/api/ $INSTALLDIR/src/api/ -# Move Puma from development section to production -RUN sed -e "/gem 'puma'/d" Gemfile > Gemfile.new; \ - echo "gem 'puma'" >> Gemfile.new; \ - diff -u Gemfile Gemfile.new; \ - mv Gemfile.new Gemfile - # The base image only has runtime dependencies, Gemfiles and pre-built assets # The assets and the Gemfile.lock have been overwritten by the ADD command above, restore them. COPY --from=base $INSTALLDIR/src/api/Gemfile.lock $INSTALLDIR/src/api/ diff --git a/src/api/Gemfile b/src/api/Gemfile index 5b38df49d810849fb2409641ba176127ebf60178..c1a70df6ec04e6f64eacae1b19a5d48167a11c0d 100644 --- a/src/api/Gemfile +++ b/src/api/Gemfile @@ -98,6 +98,8 @@ group :development, :production do gem 'ruby-ldap', require: false # to have better logs gem 'lograge' + # Use Puma as the app server (rails 5 default) + gem 'puma', '~> 4.0' end group :production do @@ -175,8 +177,6 @@ group :development, :test do gem 'single_test' # to find n+1 queries gem 'bullet' - # Use Puma as the app server (rails 5 default) - gem 'puma', '~> 4.0' # to drive headless chrome gem 'selenium-webdriver' # scan for security vulnerability (circleci only, do not touch)