Merge pull request #529 from cloudfoundry/merge-jammy-into-noble

Merge Jammy fix "bundle install" permission error into Noble

Author: rkoster

ci/docker/os-image-stemcell-builder/Dockerfile

@@ -91,6 +91,11 @@ RUN meta4_cli_path="/usr/local/bin/meta4" \
       > "${meta4_cli_path}" \
     && chmod +x "${meta4_cli_path}"
 
+ENV GEM_HOME="${GEM_HOME}" \
+    BUNDLE_APP_CONFIG="${GEM_HOME}" \
+    BUNDLE_SILENCE_ROOT_WARNING=1
+ENV PATH="${GEM_HOME}/bin:${PATH}"
+
 RUN cd /tmp  \
     && curl --show-error -sL "${RUBY_INSTALL_URL}" \
       | tar -xzf - \
@@ -103,9 +108,8 @@ RUN cd /tmp  \
     && ruby-install --jobs=${NUM_CPUS} --cleanup --system ruby ${RUBY_VERSION} \
       -- --disable-install-doc --disable-install-rdoc \
     && gem update --system \
-    && bundle config --global path "${GEM_HOME}" \
-    && bundle config --global bin "${GEM_HOME}/bin"
-ENV PATH=${GEM_HOME}/bin:${PATH}
+    && mkdir -p "${GEM_HOME}/bin" \
+    && chown -R ubuntu:ubuntu "${GEM_HOME}"
 
 RUN syft_cli_path="/usr/local/bin/syft" \
     && curl --show-error -sL "${SYFT_CLI_URL}" \

ci/tasks/os-images/build.sh

@@ -33,7 +33,7 @@ fi
 sudo chown -R ubuntu .
 sudo chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
-sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
 bundle install --local
+sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
 bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
 SUDO