From: David Taylor <david@taylorhq.com>
Date: Tue, 23 Mar 2021 14:40:49 +0000 (+0000)
Subject: DEV: Parse and install bundler version from Gemfile.lock (#530)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c906824d2919cab06d4e23b671bce3fce15e7a3;p=discourse_docker.git

DEV: Parse and install bundler version from Gemfile.lock (#530)

This ensures that changes in Bundler's behavior are only introduced
when we deliberately bump the version in the Gemfile
---

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 28fb22d..83b84b2 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -144,8 +144,8 @@ run:
       cd: $home
       hook: web
       cmd:
-        # ensure we are on latest bundler
-        - gem update bundler
+        # install bundler version to match Gemfile.lock
+        - gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
         - find $home ! -user discourse -exec chown discourse {} \+
 
   - exec: