Skip to content

Commit 6f8ba24

Browse files
authored
[ruby] Only install optional gems (#9574)
This should reduce build times slightly.
1 parent 027150a commit 6f8ba24

14 files changed

+19
-18
lines changed

frameworks/Ruby/rack-sequel/Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ gem 'json', '~> 2.8'
44
gem 'sequel', '~> 5.0'
55
gem 'rack', '~> 3.0'
66

7-
group :mysql do
7+
group :mysql, optional: true do
88
gem 'jdbc-mysql', '~> 5.1', platforms: :jruby, require: 'jdbc/mysql'
99
gem 'mysql2', '~> 0.4', platforms: [:ruby, :mswin]
1010
end
1111

12-
group :postgresql do
12+
group :postgresql, optional: true do
1313
gem 'jdbc-postgres', '~> 9.4', platforms: :jruby, require: 'jdbc/postgres'
1414
gem 'pg', '~> 1.5', platforms: [:ruby, :mswin]
1515
gem 'sequel_pg', '~> 1.6', platforms: :ruby, require: false
1616
end
1717

18-
group :passenger do
18+
group :passenger, optional: true do
1919
gem 'base64' # required by passenger on Ruby 3.4
2020
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
2121
end
2222

23-
group :puma do
23+
group :puma, optional: true do
2424
gem 'puma', '~> 6.4', require: false
2525
end
2626

27-
group :unicorn do
27+
group :unicorn, optional: true do
2828
gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
2929
end

frameworks/Ruby/rack-sequel/rack-sequel-passenger-mri.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'postgresql puma unicorn'
14+
RUN bundle config set with 'mysql passenger'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'mysql puma unicorn'
14+
RUN bundle config set with 'postgresql passenger'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'mysql passenger puma'
14+
RUN bundle config set with 'postgresql unicorn'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

1717
ENV DBTYPE=postgresql

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'mysql passenger unicorn'
14+
RUN bundle config set with 'postgresql puma'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

1717
ENV DBTYPE=postgresql

frameworks/Ruby/rack-sequel/rack-sequel-unicorn-mri.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'postgresql passenger puma'
14+
RUN bundle config set with 'mysql unicorn'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

1717
ENV DBTYPE=mysql

frameworks/Ruby/rack-sequel/rack-sequel.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
apt-get install -y --no-install-recommends libjemalloc2
1212
ENV LD_PRELOAD=libjemalloc.so.2
1313

14-
RUN bundle config set without 'postgresql passenger unicorn'
14+
RUN bundle config set with 'mysql puma'
1515
RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
1616

1717
ENV DBTYPE=mysql

frameworks/Ruby/roda-sequel/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ gem "sequel", "~> 5.67"
77
gem "roda", "~> 3.66"
88
gem "tilt", "~> 2.1", require: "tilt/erb"
99

10-
group :mysql do
10+
group :mysql, optional: true do
1111
gem "mysql2", "~> 0.5", platforms: %i[ruby mswin]
1212
end
1313

14-
group :postgresql do
14+
group :postgresql, optional: true do
1515
gem "pg", "~> 1.4", platforms: %i[ruby mswin]
1616
gem "sequel_pg", "~> 1.17", platforms: :ruby, require: false
1717
end

frameworks/Ruby/roda-sequel/Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GEM
44
base64 (0.2.0)
55
bigdecimal (3.1.8)
66
erubi (1.13.0)
7+
iodine (0.7.58)
78
json (2.9.1)
89
kgio (2.11.4)
910
mysql2 (0.5.6)
@@ -32,6 +33,7 @@ PLATFORMS
3233
DEPENDENCIES
3334
base64
3435
erubi (~> 1.12)
36+
iodine (~> 0.7)
3537
json (~> 2.8)
3638
mysql2 (~> 0.5)
3739
pg (~> 1.4)

frameworks/Ruby/roda-sequel/roda-sequel-postgres-iodine-mri.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111
ENV LD_PRELOAD=libjemalloc.so.2
1212

1313
ENV BUNDLE_FORCE_RUBY_PLATFORM=true
14-
RUN bundle config set with 'iodine'
14+
RUN bundle config set with 'postgresql iodine'
1515
RUN bundle install --jobs=8
1616

1717
ENV DBTYPE=postgresql

0 commit comments

Comments
 (0)