try VHD file

NixOS · Nov 27, 2023 · b0dd5b6 · b0dd5b6
1 parent 29537b5
commit b0dd5b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/upload-ami.yml b/.github/workflows/upload-ami.yml
@@ -22,8 +22,7 @@ jobs:
           aws-region: eu-central-1
       - name: Build AMI
         run: |
-          nix build .#nixosConfigurations.amazonImage-x64_64-linux.config.system.build.imageInfo
+          nix build .#nixosConfigurations.amazonImage-x64_64-linux.config.system.build.amazonImage
       - name: Upload AMIs
         run: |
-          # nix develop --command python3 ./upload_ami/cli.py --image-info ./result/nix-support/image-info.json --s3-bucket images20231124161256194400000001
-          nix develop --command python3 ./upload_ami/cli.py --image-info ./result --s3-bucket images20231124161256194400000001
+          nix develop --command python3 ./upload_ami/cli.py --image-info ./result/nix-support/image-info.json --s3-bucket images20231124161256194400000001
diff --git a/modules/amazon-image.nix b/modules/amazon-image.nix
@@ -18,6 +18,21 @@ in
     boot_mode = "uefi";
   };
 
+  system.build.amazonImage =
+    # For some reason amazon doesn't like RAW files???
+    pkgs.runCommand "amazon-image" { } ''
+      mkdir -p $out
+      mkdir -p $out/nix-support
+      ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O vpc ${config.system.build.image}/image.raw $out/image.vhd
+      cat <<EOF > $out/nix-support/image-info.json
+      {
+        "label": "${config.system.nixos.label}",
+        "system": "${pkgs.stdenv.hostPlatform.system}",
+        "file": "$out/image.vhd"
+      }
+      EOF
+    '';
+
   image.repart.name = "${config.system.nixos.distroId}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
   image.repart.partitions = {
     "00-esp" = {