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.

Sign up for GitHub

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

singularity-tools: fix buildImage #78945

Merged
merged 1 commit into from Feb 3, 2020
Merged

singularity-tools: fix buildImage #78945

merged 1 commit into from Feb 3, 2020

Conversation

jbedo
Copy link
Contributor

@jbedo jbedo commented Jan 31, 2020 •
edited

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 commented Jan 31, 2020

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

@tbenst tbenst mentioned this pull request Feb 1, 2020
Closed
@tbenst
Copy link
Contributor

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
Contributor

@tbenst How can I test this?

@tbenst
Copy link
Contributor

tbenst commented Feb 3, 2020 •
edited

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

worldofpeace
worldofpeace approved these changes Feb 3, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works 👍

@worldofpeace worldofpeace merged commit 8ecbde9 into NixOS:master Feb 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

singularity-tools.buildImage: FATAL: shell /bin/sh doesn't exist in container
3 participants
@jbedo @tbenst @worldofpeace