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.

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/cadvisor: don't enable docker #71329

Merged
merged 1 commit into from Mar 14, 2020
Merged

nixos/cadvisor: don't enable docker #71329

merged 1 commit into from Mar 14, 2020

Conversation

tilpner
Copy link
Member

@tilpner tilpner commented Oct 18, 2019

cadvisor has usecases that don't involve docker, and it's entirely
unexpected for a monitoring service to enable docker.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @offlinehacker

@tilpner
nixos/cadvisor: don't enable docker
1ae39ff 
cadvisor has usecases that don't involve docker, and it's entirely
unexpected for a monitoring service to enable docker.
@tilpner
Copy link
Member Author

tilpner commented Oct 18, 2019

The service still depends on docker.service, so it should still work when docker is explicitly enabled (though I haven't tested this).

Depending on a missing service doesn't seem to cause problems.
Alternatively we could check virtualisation.docker.enable and services.influxdb.enable while deciding the value of systemd.services.cadvisor.after.

@marsam
Copy link
Contributor

marsam commented Mar 14, 2020

@GrahamcOfBorg test cadvisor

@marsam marsam merged commit ee599f3 into NixOS:master Mar 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tilpner @marsam