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

google-compute-image: switch to use the common make-disk-image.nix #25165

Merged
merged 1 commit into from Apr 24, 2017

Conversation

copumpkin
Copy link
Member

Motivation for this change

Let's reduce the amount of duplication and avoid the slight differences in how our systems are built.

I don't have a convenient Google set-up to test these images on a real platform, so the only thing I've done so far is make sure it still builds. I'll start adding some tests in a bit as a result of #24973, but need to factor out the common aspects from the EC2 tests first.

@Mic92 do you mind testing the image this produces? I'm happy to fix anything that's wrong

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@copumpkin, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rbvermaa, @oconnorr and @Phreedom to be potential reviewers.

@copumpkin copumpkin added this to Improve consistency in Amazing images Apr 24, 2017
@Mic92
Copy link
Member

Mic92 commented Apr 24, 2017

I will take a look

rm $out/disk.raw
popd
'';
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
Copy link
Member

@Mic92 Mic92 Apr 24, 2017

Choose a reason for hiding this comment

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

One thing I noticed, is that the image name no longer includes the label and architecture. I don't know though if this is required or wanted somewhere.

@Mic92
Copy link
Member

Mic92 commented Apr 24, 2017

The image itself is working fine. I noticed a slight increase in image size (~200mb -> 220mb; compressed), but this might be uncorrelated.

@domenkozar
Copy link
Member

We should probably do the same for:

@Mic92
Copy link
Member

Mic92 commented Apr 24, 2017

brightbox is already addressed here: #25166

@copumpkin
Copy link
Member Author

copumpkin commented Apr 24, 2017 via email

@copumpkin
Copy link
Member Author

@Mic92 I pushed a new revision that produces image files that look like this:

$ ls -al /nix/store/6msxcn03mq04cwphck3hrc6yjakdgz60-google-compute-image
total 222466
dr-xr-xr-x    2 root root           3 Jan  1  1970 .
drwxrwxr-t 3724 root nixbld     12994 Apr 24 18:37 ..
-r--r--r--    1 root root   234839949 Jan  1  1970 nixos-image-17.09.git.72387fb-x86_64-linux.tar.gz

Does that seem reasonable?

@copumpkin
Copy link
Member Author

Will merge and we can adjust the name a bit if needed later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Amazing images
Improve consistency
Development

Successfully merging this pull request may close these issues.

None yet

4 participants