google-compute-image: switch to use the common make-disk-image.nix #25165
+16
−84
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
copumpkin
added
the
6.topic: nixos
|
@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. |
|
I will take a look |
Mic92
reviewed
Apr 24, 2017
| rm $out/disk.raw | ||
| popd | ||
| ''; | ||
| diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; |
There was a problem hiding this comment.
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.
|
The image itself is working fine. I noticed a slight increase in image size (~200mb -> 220mb; compressed), but this might be uncorrelated. |
Mic92
approved these changes
Apr 24, 2017
|
brightbox is already addressed here: #25166 |
|
@domenkozar yeah, haven't had time to do Azure one yet but as @Mic92 says,
I already did Brightbox
@Mic92 thanks! I'll add the info back to the name and merge. Not sure what
the size diff is but it doesn't seem too concerning
…On Mon, Apr 24, 2017 at 06:34 Jörg Thalheim ***@***.***> wrote:
brightbox is already addressed here: #25166
<#25166>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#25165 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAAKP7zlQmsB-rnS4zfg-eOnoxKFpwfUks5rzHqfgaJpZM4NFpAl>
.
|
copumpkin
force-pushed
the
google-image-common
branch
from
72387fb to
9fae0f3
Compare
|
@Mic92 I pushed a new revision that produces image files that look like this: Does that seem reasonable? |
|
Will merge and we can adjust the name a bit if needed later. |
7 tasks
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)