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

nixos/dockerPreloader: guard the entire implemetation with mkIf on image list #55589

Merged
merged 1 commit into from Feb 12, 2019

Conversation

@johanot
Copy link
Contributor

@johanot johanot commented Feb 11, 2019

Motivation for this change

I've been seeing issues where existing preloaded images in the docker daemon gets garbled when restarting docker.service. This happens because dockerPreloader overwrites repository.json and it is not designed to preserve any images that might be pre-loaded before it runs.

example:
image

Currently, there's no way of disabling the dockerPreloader. But I think it is ok to assume that if the list of images to preload is empty, we can safely drop configuring the systemd unit for the preloader. What do you say @nlewo?

cc @srhb

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nlewo
Copy link
Member

@nlewo nlewo commented Feb 12, 2019

@GrahamcOfBorg test docker-preloader

@johanot yes, it's better to remove the systemd unit which is then useless.

nlewo
nlewo approved these changes Feb 12, 2019
@nlewo nlewo merged commit b2f3738 into NixOS:master Feb 12, 2019
12 checks passed
@johanot johanot deleted the docker-preloader-mkif-guard branch Feb 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants