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

singularity-tools: fix buildImage #78945

Merged
merged 1 commit into from Feb 3, 2020
Merged

Conversation

@jbedo
Copy link
Contributor

@jbedo jbedo commented Jan 31, 2020

Motivation for this change

Resolves #78811 and #78976

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
@tbenst
Copy link
Contributor

@tbenst tbenst commented Jan 31, 2020

Per #78811 (comment), tested and works for me

@jbedo jbedo force-pushed the jbedo:singularity-img branch from bf25d31 to 56c2235 Feb 1, 2020
@tbenst
Copy link
Contributor

@tbenst tbenst commented Feb 3, 2020

@worldofpeace could we add this to 20.03 milestone?

@worldofpeace worldofpeace added this to the 20.03 milestone Feb 3, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 3, 2020

@tbenst How can I test this?

@tbenst
Copy link
Contributor

@tbenst tbenst commented Feb 3, 2020

@worldofpeace:

default.nix:

{pkgs ? import <nixpkgs> {} }:

with pkgs;

singularity-tools.buildImage {
  name = "test";
  diskSize = 1024*25;
  contents = [ hello openjdk8 ];
  runScript = "${hello}/bin/hello";
}

edit: fixed bad copy-paste

@tbenst
Copy link
Contributor

@tbenst tbenst commented Feb 3, 2020

@worldofpeace sorry fixed bad copy paste. After build, if you have programs.singularity.enable = true;, can test with: singularity run result

Copy link
Member

@worldofpeace worldofpeace left a comment

It works 👍

@worldofpeace worldofpeace merged commit 8ecbde9 into NixOS:master Feb 3, 2020
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
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.

3 participants
You can’t perform that action at this time.