Skip to content
Snippets Groups Projects
Unverified Commit 707c53a0 authored by Andrej Shadura's avatar Andrej Shadura
Browse files

Instead of patching Gemfile with sed, move puma to prod+dev group

parent 7e547a80
No related branches found
No related tags found
1 merge request!2Add Dockerisation and Collabora-specific patches
Pipeline #39049 passed
......@@ -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/
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment