Skip to content

Commit 1a6c165

Browse files
committed
[rails] Only install used servers
When testing with puma we don't need to install falcon. Unicorn is no longer tested so we can remove it from the Gemfile.
1 parent ada90ad commit 1a6c165

File tree

8 files changed

+10
-20
lines changed

8 files changed

+10
-20
lines changed

frameworks/Ruby/rails/Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ group :puma do
2121
gem 'puma', '~> 6.4', require: false
2222
end
2323

24-
group :unicorn do
25-
gem 'unicorn', '~> 6.1', require: false
26-
end
27-
2824
group :agoo do
2925
gem 'agoo', require: false
3026
gem 'rackup'

frameworks/Ruby/rails/Gemfile.lock

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ GEM
138138
rdoc (>= 4.0.0)
139139
reline (>= 0.4.2)
140140
json (2.7.2)
141-
kgio (2.11.4)
142141
localhost (1.3.1)
143142
logger (1.6.1)
144143
loofah (2.22.0)
@@ -234,7 +233,6 @@ GEM
234233
rake (>= 12.2)
235234
thor (~> 1.0, >= 1.2.2)
236235
zeitwerk (~> 2.6)
237-
raindrops (0.20.1)
238236
rake (13.2.1)
239237
rdoc (6.7.0)
240238
psych (>= 4.0.0)
@@ -257,9 +255,6 @@ GEM
257255
concurrent-ruby (~> 1.0)
258256
tzinfo-data (1.2024.2)
259257
tzinfo (>= 1.0.0)
260-
unicorn (6.1.0)
261-
kgio (~> 2.6)
262-
raindrops (~> 0.7)
263258
useragent (0.16.10)
264259
webrick (1.8.2)
265260
websocket-driver (0.7.6)
@@ -283,7 +278,6 @@ DEPENDENCIES
283278
redis (~> 5.0)
284279
trilogy (~> 2.8.1)
285280
tzinfo-data
286-
unicorn (~> 6.1)
287281

288282
BUNDLED WITH
289283
2.3.3

frameworks/Ruby/rails/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ comparing a variety of web platforms.
1313
The tests were run with:
1414

1515
- [Ruby 3.3](http://www.ruby-lang.org/)
16-
- [Rails 7.1](http://rubyonrails.org/)
16+
- [Rails 7.2](http://rubyonrails.org/)
1717
- [Puma 6.4](http://puma.io/)
1818
- [MySQL](https://dev.mysql.com/)
1919
- [PostgreSQL](https://www.postgresql.org/)

frameworks/Ruby/rails/rails-agoo.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1515
COPY ./Gemfile* /rails/
1616

1717
ENV BUNDLE_FORCE_RUBY_PLATFORM=true
18-
ENV BUNDLE_WITHOUT=trilogy
18+
ENV BUNDLE_WITHOUT=mysql:falcon:puma
1919
RUN bundle install --jobs=8
2020

2121
COPY . /rails/

frameworks/Ruby/rails/rails-falcon.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ ENV LD_PRELOAD=libjemalloc.so.2
1515
COPY ./Gemfile* /rails/
1616

1717
ENV BUNDLE_FORCE_RUBY_PLATFORM=true
18-
ENV BUNDLE_WITHOUT=mysql
18+
ENV BUNDLE_WITHOUT=mysql:agoo:puma
1919
RUN bundle install --jobs=8
2020

2121
COPY . /rails/
2222

2323
ENV RAILS_ENV=production_postgresql
2424
ENV PORT=8080
2525
ENV REDIS_URL=redis://localhost:6379/0
26+
CMD service redis-server start
2627
CMD bundle exec falcon host

frameworks/Ruby/rails/rails-mysql.dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ ENV LD_PRELOAD=libjemalloc.so.2
1515
COPY ./Gemfile* /rails/
1616

1717
ENV BUNDLE_FORCE_RUBY_PLATFORM=true
18-
ENV BUNDLE_WITHOUT=postgresql
18+
ENV BUNDLE_WITHOUT=postgresql:agoo:falcon
1919
RUN bundle install --jobs=8
2020

2121
COPY . /rails/
2222

2323
ENV RAILS_ENV=production_mysql
2424
ENV PORT=8080
2525
ENV REDIS_URL=redis://localhost:6379/0
26-
CMD ./run-with-redis.sh
26+
CMD service redis-server start
27+
CMD rails server

frameworks/Ruby/rails/rails.dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ ENV LD_PRELOAD=libjemalloc.so.2
1515
COPY ./Gemfile* /rails/
1616

1717
ENV BUNDLE_FORCE_RUBY_PLATFORM=true
18-
ENV BUNDLE_WITHOUT=mysql
18+
ENV BUNDLE_WITHOUT=mysql:agoo:falcon
1919
RUN bundle install --jobs=8
2020

2121
COPY . /rails/
2222

2323
ENV RAILS_ENV=production_postgresql
2424
ENV PORT=8080
2525
ENV REDIS_URL=redis://localhost:6379/0
26-
CMD ./run-with-redis.sh
26+
CMD service redis-server start
27+
CMD rails server

frameworks/Ruby/rails/run-with-redis.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)