Merge branch 'bundler-2'

Author: PeterJCLaw

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          cache-version: 2
+          cache-version: 3
 
       - name: Build & Validate
         run: rake validate

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /usr/src/docs
 
 RUN git config --global --add safe.directory /usr/src/docs && git config --global --add safe.directory /usr/src/docs/_sass/brand
 
-RUN gem install 'bundler:~>1' rake
+RUN gem install 'bundler:2.4.22' rake
 
 COPY . ./
 

Gemfile.lock

@@ -106,4 +106,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

README.md

@@ -14,10 +14,10 @@ Once setup, the site will be accessible on http://localhost:4000/docs/
 
 1. [Install Ruby][install-ruby]
 
-2. Install Bundler (1.x) and Rake
+2. Install Bundler (2.x) and Rake
 
     ``` shell
-    $ gem install 'bundler:~>1' rake
+    $ gem install bundler rake
     ```
 
 3. Start the app in development mode

Rakefile

@@ -11,11 +11,10 @@ task :deep_clean => [:clean] do
 end
 
 task :dependencies do
-  if ENV["GLOBAL_GEMS"]
-    sh('bundle install')
-  else
-    sh('bundle install --path gems')
+  if ! ENV["GLOBAL_GEMS"]
+    sh('bundle config set --local path "gems"')
   end
+  sh('bundle install')
 
   # Fix pathutil on Ruby 3; works around https://github.com/envygeeks/pathutil/pull/5
   # as suggested by https://stackoverflow.com/a/73909894/67873