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

Merged
merged 1 commit into from Aug 21, 2019

Conversation

@uvNikita
Copy link
Contributor

commented Aug 21, 2019

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

This comment has been minimized.

Copy link
Contributor

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 uvNikita force-pushed the uvNikita:containers/fix-imperative branch from 24c8346 to ca79d3a Aug 21, 2019
@uvNikita

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

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

@srhb

This comment has been minimized.

Copy link
Contributor

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

Fixes #67174.
@uvNikita uvNikita force-pushed the uvNikita:containers/fix-imperative branch from ca79d3a to 578d712 Aug 21, 2019
@uvNikita

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

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

This comment has been minimized.

Copy link
Contributor

commented Aug 21, 2019

Great! Looks good, thanks!

@srhb srhb merged commit f20fbee into NixOS:master Aug 21, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@uvNikita uvNikita deleted the uvNikita:containers/fix-imperative branch Aug 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.