Skip to content

Commit 679b70f

Browse files
Drop manual bundler installation (#1038)
Since bundler 2.3.0 (2021-12-21), it automatically takes care of installing & using the version specified in `Gemfile.lock`.
1 parent e5531b9 commit 679b70f

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

image/base/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ ARG DISCOURSE_BRANCH=main
156156

157157
# Discourse specific bits
158158
RUN install -dm 0755 -o discourse -g discourse /var/www/discourse &&\
159-
sudo -u discourse git clone --branch $DISCOURSE_BRANCH --filter=tree:0 https://github.com/discourse/discourse.git /var/www/discourse &&\
160-
gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' /var/www/discourse/Gemfile.lock)
159+
sudo -u discourse git clone --branch $DISCOURSE_BRANCH --filter=tree:0 https://github.com/discourse/discourse.git /var/www/discourse
161160

162161
FROM discourse_slim AS discourse_web_only
163162
ENV RAILS_ENV=production

templates/web.template.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ run:
180180
cd: $home
181181
hook: web
182182
cmd:
183-
# install bundler version to match Gemfile.lock
184-
- gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
185183
- find $home ! -user discourse -exec chown discourse {} \+
186184

187185
- exec:

0 commit comments

Comments
 (0)