Merge remote-tracking branch 'origin/master' into main-jh

docs/ci-variables.md

@@ -22,6 +22,7 @@ Check the table below for more information about the various CI variables used i
 | EE_PIPELINE                                   | Setting any value indicates this will be an EE only pipeline. |
 | CUSTOM_PIPELINE                               | Setting any value indicates this will be a custom pipeline (Do not run CE or EE specific jobs.) |
 | DEPENDENCY_PROXY                              | Sets the dockerhub registry location. See [details](build.md#dependency-proxy). |
+|GITLAB_BUNDLE_GEMFILE                          | Setting Gemfile path required by `gitlab-rails` bundle. If bundle uses the default Gemfile, just keep it unset. |
 
 ## Test variables
 

gitlab-rails/Dockerfile.erb

@@ -112,6 +112,12 @@ RUN cd /srv/gitlab && \
 
 # Install gems
 COPY --chown=git vendor/bundle/ /srv/gitlab/vendor/bundle
+
+<% if compile_assets and gitlab_bundle_gemfile %>
+RUN cd /srv/gitlab && \
+    sudo -u git -H bundle config set --local gemfile <%= gitlab_bundle_gemfile %>
+<% end %>
+
 RUN cd /srv/gitlab && \
     sudo -u git -H bundle install --clean --deployment --without development test mysql aws kerberos --jobs 4 --retry 5
 

gitlab-rails/renderDockerfile

@@ -11,6 +11,10 @@ def ee?
   ENV['RAILS_EE'].eql?('true')
 end
 
+def gitlab_bundle_gemfile
+  ENV['GITLAB_BUNDLE_GEMFILE']
+end
+
 puts "Rendering Dockerfile"
 
 template = ERB.new(File.read('Dockerfile.erb'))