Fix docker setup

.docker/Dockerfile

@@ -9,7 +9,7 @@
 #
 # Also we don't use -onbuild as they're deprecated
 # https://github.com/docker-library/official-images/issues/2076
-FROM ruby:3.0.2 as dev
+FROM ruby:3.0.6 as dev
 LABEL maintainer="[email protected]"
 
 # Installs system dependencies
@@ -65,7 +65,7 @@ RUN mkdir /db-init && chown 1000 /db-init
 USER decidim
 
 # Update system gems
-RUN gem install bundler:2.4.7
+RUN gem install bundler
 RUN gem update --system
 
 # Copy Gemfile and install bundle dependencies

.docker/entrypoint.sh

@@ -2,6 +2,7 @@
 
 set -e
 
+gem install bundler
 bundle install
 
 bin/rails db:migrate RAILS_ENV=development

.docker/webpack-entrypoint.sh

@@ -2,6 +2,7 @@
 
 set -e
 
+yarn add [email protected] --dev
 yarn install
 
 exec "$@"

bin/bundle-binstub

@@ -27,7 +27,7 @@ m = Module.new do
     bundler_version = nil
     update_index = nil
     ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
@@ -47,7 +47,7 @@ m = Module.new do
   def lockfile
     lockfile =
       case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
       else "#{gemfile}.lock"
       end
     File.expand_path(lockfile)
@@ -62,22 +62,17 @@ m = Module.new do
 
   def bundler_requirement
     @bundler_requirement ||=
-      env_var_version || cli_arg_version ||
-        bundler_requirement_for(lockfile_version)
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
   end
 
   def bundler_requirement_for(version)
     return "#{Gem::Requirement.default}.a" unless version
 
     bundler_gem_version = Gem::Version.new(version)
 
-    requirement = bundler_gem_version.approximate_recommendation
-
-    return requirement unless Gem.rubygems_version < Gem::Version.new("2.7.0")
-
-    requirement += ".a" if bundler_gem_version.prerelease?
-
-    requirement
+    bundler_gem_version.approximate_recommendation
   end
 
   def load_bundler!

package.json

@@ -56,6 +56,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-standard": "^3.1.0",
     "sass-embedded": "~1.57.1",
-    "stylelint": "^13.11.0"
+    "stylelint": "^13.11.0",
+    "webpack-dev-server": "4.15.1"
   }
 }