Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/cri-o: share registries with nixos/containers #85916

Merged
merged 1 commit into from
Apr 24, 2020
Merged

nixos/cri-o: share registries with nixos/containers #85916

merged 1 commit into from
Apr 24, 2020
+9 −9

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Apr 24, 2020

https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md#crioimage-table

CRI-O reads its configured registries defaults from the system wide containers-registries.conf(5) located in /etc/containers/registries.conf. If you want to modify just CRI-O, you can change the registries configuration in this file. Otherwise, leave insecure_registries and registries commented out to use the system's defaults from /etc/containers/registries.conf.

cc @adisbladis @saschagrunert @vdemeester

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Apr 24, 2020
saschagrunert
saschagrunert approved these changes Apr 24, 2020
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, LGTM

vdemeester
vdemeester approved these changes Apr 24, 2020
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐶

@adisbladis
Copy link
Member

Could you create a release note?

@saschagrunert
Copy link
Member

This sadly needs a rebase :(

@ofborg ofborg bot added 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Apr 24, 2020
@zowoq
Copy link
Contributor Author

zowoq commented Apr 24, 2020

Added a note.

@adisbladis adisbladis merged commit b66139c into NixOS:master Apr 24, 2020
@zowoq zowoq deleted the registry branch April 24, 2020 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester

@saschagrunert saschagrunert

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zowoq @adisbladis @saschagrunert @vdemeester