Skip to content

Commit aea3a4f

Browse files
authored
[ruby/sinatra] Don't install unused servers (#9439)
For example, don't install unicorn when testing puma.
1 parent 40b1ad6 commit aea3a4f

11 files changed

+32
-19
lines changed
Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
source 'https://rubygems.org'
22

33
gem 'json', '~> 2.8'
4-
gem 'passenger', '~> 6.0', :platforms=>[:ruby, :mswin], :require=>false
5-
gem 'puma', '~> 6.4', :require=>false
64
gem 'sequel', '~> 5.0'
75
gem 'sinatra', '~> 4.0', :require=>'sinatra/base'
8-
gem 'unicorn', '~> 6.1', :platforms=>[:ruby, :mswin], :require=>false
96

107
group :mysql do
118
gem 'mysql2', '~> 0.5', :platforms=>[:ruby, :mswin]
@@ -15,3 +12,15 @@ group :postgresql do
1512
gem 'pg', '~> 1.5', :platforms=>[:ruby, :mswin]
1613
gem 'sequel_pg', '~> 1.6', :platforms=>:ruby, :require=>false
1714
end
15+
16+
group :passenger do
17+
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
18+
end
19+
20+
group :puma do
21+
gem 'puma', '~> 6.4', require: false
22+
end
23+
24+
group :unicorn do
25+
gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
26+
end

frameworks/Ruby/sinatra-sequel/sinatra-sequel-base.dockerfile

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

frameworks/Ruby/sinatra-sequel/sinatra-sequel-postgres-passenger-mri.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra-sequel
1111
WORKDIR /sinatra-sequel
1212

13+
ENV BUNDLE_WITHOUT=mysql:puma:unicorn
1314
RUN bundle install --jobs=4 --gemfile=/sinatra-sequel/Gemfile
1415

1516
# TODO: https://github.com/phusion/passenger/issues/1916

frameworks/Ruby/sinatra-sequel/sinatra-sequel-postgres-unicorn-mri.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra-sequel
1111
WORKDIR /sinatra-sequel
1212

13+
ENV BUNDLE_WITHOUT=mysql:passenger:puma
1314
RUN bundle install --jobs=4 --gemfile=/sinatra-sequel/Gemfile
1415

1516
ENV DBTYPE=postgresql

frameworks/Ruby/sinatra-sequel/sinatra-sequel-postgres.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra-sequel
1111
WORKDIR /sinatra-sequel
1212

13+
ENV BUNDLE_WITHOUT=mysql:passenger:unicorn
1314
RUN bundle install --jobs=4 --gemfile=/sinatra-sequel/Gemfile
1415

1516
ENV DBTYPE=postgresql

frameworks/Ruby/sinatra-sequel/sinatra-sequel.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra-sequel
1111
WORKDIR /sinatra-sequel
1212

13+
ENV BUNDLE_WITHOUT=postgresql:passenger:unicorn
1314
RUN bundle install --jobs=4 --gemfile=/sinatra-sequel/Gemfile
1415

1516
ENV DBTYPE=mysql

frameworks/Ruby/sinatra/Gemfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ source 'https://rubygems.org'
22

33
gem 'activerecord', '~> 7.2', require: 'active_record'
44
gem 'json', '~> 2.8'
5-
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
6-
gem 'puma', '~> 6.4', require: false
75
gem 'sinatra', '~> 4.0', require: 'sinatra/base'
8-
gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
96

107
group :mysql do
118
gem 'mysql2', '~> 0.5', :platforms=>[:ruby, :mswin]
@@ -14,3 +11,15 @@ end
1411
group :postgresql do
1512
gem 'pg', '~> 1.5', platforms: [:ruby, :mswin]
1613
end
14+
15+
group :passenger do
16+
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
17+
end
18+
19+
group :puma do
20+
gem 'puma', '~> 6.4', require: false
21+
end
22+
23+
group :unicorn do
24+
gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
25+
end

frameworks/Ruby/sinatra/sinatra-postgres-passenger-mri.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra
1111
WORKDIR /sinatra
1212

13+
ENV BUNDLE_WITHOUT=mysql:puma:unicorn
1314
RUN bundle install --jobs=4 --gemfile=/sinatra/Gemfile
1415

1516
# TODO: https://github.com/phusion/passenger/issues/1916

frameworks/Ruby/sinatra/sinatra-postgres-unicorn-mri.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra
1111
WORKDIR /sinatra
1212

13+
ENV BUNDLE_WITHOUT=mysql:passenger:puma
1314
RUN bundle install --jobs=4 --gemfile=/sinatra/Gemfile
1415

1516
ENV DBTYPE=postgresql

frameworks/Ruby/sinatra/sinatra-postgres.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ENV LD_PRELOAD=libjemalloc.so.2
1010
ADD ./ /sinatra
1111
WORKDIR /sinatra
1212

13+
ENV BUNDLE_WITHOUT=mysql:passenger:unicorn
1314
RUN bundle install --jobs=4 --gemfile=/sinatra/Gemfile
1415

1516
ENV DBTYPE=postgresql

0 commit comments

Comments
 (0)