Skip to content

Bump docker_registry2 to 1.13#6885

Merged
jeffwidman merged 2 commits intomainfrom
bump-docker-registry2
Mar 22, 2023
Merged

Bump docker_registry2 to 1.13#6885
jeffwidman merged 2 commits intomainfrom
bump-docker-registry2

Conversation

@jeffwidman
Copy link
Copy Markdown
Member

Bump docker_registry2 to 1.13 to pickup the fix in deitch/docker_registry2#68.

This pin isn't strictly necessary since the upstream fix is mostly cosmetic making a stack trace more legible, so I originally wasn't going to force it.

However, I removed the >= pin as it's redundant given the ~> pin. It crept in originally as part of forcing a newer patch release in e991abb, but should have been removed by 0299755 / #5436.

And since I was doing that, I figured I might as well bump it too.

@jeffwidman jeffwidman requested a review from a team as a code owner March 21, 2023 19:01
@Nishnha
Copy link
Copy Markdown
Member

Nishnha commented Mar 21, 2023

Seems like the test failures are related to us using BUNDLE_FROZEN, which we introduced in #5972

The errors are caused by our Gemfile and Gemfile.lock being out of sync

I think we need to update it here too?

docker_registry2 (~> 1.11, >= 1.11.0)

We should probably update the license as well

@jeffwidman
Copy link
Copy Markdown
Member Author

ah yeah, good ol' cd updater && bundle install probably... I have to do that routinely on the Dependabot PR's...

@jeffwidman jeffwidman force-pushed the bump-docker-registry2 branch from 5ad5dc2 to ef977a8 Compare March 21, 2023 22:38
@jeffwidman
Copy link
Copy Markdown
Member Author

I think this is good to go for now.

I'm not worried about bumping the license and would rather ignore it for now--we can pick that up later, when we add a CI check enforcing license update compliance, otherwise it'll just fall out of date again...

@jeffwidman jeffwidman enabled auto-merge (squash) March 21, 2023 23:41
Bump `docker_registry2` to `1.13` to pickup the fix in deitch/docker_registry2#68.

This pin isn't strictly necessary since the upstream fix is mostly cosmetic making a stack trace more legible, so I originally wasn't going to force it.

However, I removed the `>=` pin as it's redundant given the `~>` pin. It crept in originally as part of forcing a newer patch release in e991abb, but should have been removed by 0299755 / #5436.

And since I was doing that, I figured I might as well bump it too.
@jeffwidman jeffwidman force-pushed the bump-docker-registry2 branch from ef977a8 to 1681631 Compare March 22, 2023 16:21
@jeffwidman jeffwidman merged commit 0c8abcb into main Mar 22, 2023
@jeffwidman jeffwidman deleted the bump-docker-registry2 branch March 22, 2023 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants