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/containers: fix imperative containers #67179

Merged
merged 1 commit into from Aug 21, 2019
Merged

nixos/containers: fix imperative containers #67179

merged 1 commit into from Aug 21, 2019

Conversation

uvNikita
Copy link
Contributor

Motivation for this change

Fixes #67174.

Unfortunately, we have to duplicate INSTANCE = "%i" in both places due to how // is merging values: { env.a = 1; env.b = 2; } // { env.a = 3; } returns { env.a = 3; }. Let me know if there is a better way.

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 @mmahut @srhb

@srhb
Copy link
Contributor

srhb commented Aug 21, 2019

You could either use recursiveUpdate instead of // on the top merge, or simply environment = unit.environment // ... locally, if you want.

@uvNikita
Copy link
Contributor Author

@srhb Didn't know about recursiveUpdate, thanks for the tip!

@srhb
Copy link
Contributor

srhb commented Aug 21, 2019

Welcome!

Looks like the test succeeds now, but I think something is broken related to container shutdown. Compare these logs from this PR and current unstable respectively.

I've included everything from the last nixos-container destroy foo: https://gist.github.com/srhb/5355fd5b2970bf86596f6373530ba951

@uvNikita
Copy link
Contributor Author

uvNikita commented Aug 21, 2019 •
edited

Good catch! I think this is the root cause:

machine# [ 47.117609] container foo[8800]: cat: /run/containers/foo.pid: No such file or directory

It seems like we, unfortunately, can't declare /run/containers as a runtime directory of the service because we are using it after it exited, so I reverted this change.

Tests should be fixed now.

@srhb
Copy link
Contributor

srhb commented Aug 21, 2019

Great! Looks good, thanks!

@srhb srhb merged commit f20fbee into NixOS:master Aug 21, 2019
@uvNikita uvNikita deleted the containers/fix-imperative branch August 21, 2019 19:43
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.

nixos/tests/containers-imperative.nix broken
2 participants
@uvNikita @srhb