From c2f090bf9f68712a004dfdc7b00a8ec0479dc00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 22 Jan 2024 19:32:45 +0100 Subject: [PATCH 1/3] Remove note we have not been following --- Dockerfile.updater-core | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile.updater-core b/Dockerfile.updater-core index 4d5a66b861..ca6953f511 100644 --- a/Dockerfile.updater-core +++ b/Dockerfile.updater-core @@ -109,8 +109,6 @@ RUN for ecosystem in git_submodules terraform github_actions hex elm docker nuge WORKDIR $DEPENDABOT_HOME/dependabot-updater # When bumping Bundler, need to also regenerate `updater/Gemfile.lock` via `bundle lock --update --bundler` -# Generally simplest to match the bundler version to the one that comes by default with whatever Ruby version we install. -# This way other projects that import this library don't have to futz around with installing new / unexpected bundler versions. ARG BUNDLER_V2_VERSION=2.5.3 RUN gem install bundler -v $BUNDLER_V2_VERSION --no-document && \ From ee5d08294b090bb37ee13481df5bf69cff6b464a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 22 Jan 2024 19:34:08 +0100 Subject: [PATCH 2/3] Reword note to work with the more complicated setup we have now --- Dockerfile.updater-core | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.updater-core b/Dockerfile.updater-core index ca6953f511..1992a53597 100644 --- a/Dockerfile.updater-core +++ b/Dockerfile.updater-core @@ -108,7 +108,9 @@ RUN for ecosystem in git_submodules terraform github_actions hex elm docker nuge WORKDIR $DEPENDABOT_HOME/dependabot-updater -# When bumping Bundler, need to also regenerate `updater/Gemfile.lock` via `bundle lock --update --bundler` +# When bumping Bundler, need to also: +# * Regenerate `updater/Gemfile.lock` via `BUNDLE_GEMFILE=updater/Gemfile bundle lock --update --bundler` +# * Regenerate `Gemfile.lock` via `bundle lock --update --bundler`. ARG BUNDLER_V2_VERSION=2.5.3 RUN gem install bundler -v $BUNDLER_V2_VERSION --no-document && \ From 690e9926f08f33d24f00cdd6845ec90bdb0a6da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Mon, 22 Jan 2024 19:34:23 +0100 Subject: [PATCH 3/3] Bump bundler to 2.5.5 --- Dockerfile.updater-core | 2 +- Gemfile.lock | 2 +- updater/Gemfile.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.updater-core b/Dockerfile.updater-core index 1992a53597..2ba9f75882 100644 --- a/Dockerfile.updater-core +++ b/Dockerfile.updater-core @@ -111,7 +111,7 @@ WORKDIR $DEPENDABOT_HOME/dependabot-updater # When bumping Bundler, need to also: # * Regenerate `updater/Gemfile.lock` via `BUNDLE_GEMFILE=updater/Gemfile bundle lock --update --bundler` # * Regenerate `Gemfile.lock` via `bundle lock --update --bundler`. -ARG BUNDLER_V2_VERSION=2.5.3 +ARG BUNDLER_V2_VERSION=2.5.5 RUN gem install bundler -v $BUNDLER_V2_VERSION --no-document && \ rm -rf /var/lib/gems/*/cache/* && \ diff --git a/Gemfile.lock b/Gemfile.lock index b67a7efee7..a38f22e836 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,4 +387,4 @@ DEPENDENCIES webrick (>= 1.7) BUNDLED WITH - 2.5.3 + 2.5.5 diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index 6372f13052..2947f23b08 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -405,4 +405,4 @@ DEPENDENCIES webrick (>= 1.7) BUNDLED WITH - 2.5.3 + 2.5.5