wip: reorganize crates

Cargo.toml

@@ -4,7 +4,7 @@ strip = true
 [workspace]
 members = [
     "goldboot",
-    "goldboot-build",
+    "goldboot-foundry",
     "goldboot-image",
     "goldboot-linux",
     "goldboot-registry",

examples/SimpleAlloy/README.md

@@ -0,0 +1,9 @@
+## Simple Alloy
+
+This example creates a simple "alloy" image which contains Debian and Windows 11.
+
+To generate the image, enter the directory and run:
+
+```sh
+goldboot build
+```

examples/SimpleAlloy/goldboot.ron

@@ -0,0 +1,27 @@
+(
+  name: "Alloy example",
+  description: "Example of how to build a simple alloy image",
+  arch: "x86_64",
+  size: "256 Gb",
+  alloy: [
+    (
+      source: Iso(
+        checksum: "sha1:3700a16d4fcabbd29e9a7fbc97da732c4577dc2a",
+        url: "https://mirrors.edge.kernel.org/archlinux/iso/latest/archlinux-2022.05.01-x86_64.iso",
+      ),
+      mold: ArchLinux(
+        hostname: "ExampleArch",
+        mirrorlist: [
+          "https://mirrors.edge.kernel.org/archlinux/$repo/os/$arch",
+        ],
+        root_password: "root",
+        packages: ["alacritty", "git", "neovim"],
+      ),
+    ),
+    (
+      mold: Windows11(
+        hostname: "ExampleWindows",
+      ),
+    ),
+  ],
+)

examples/SimpleArchLinux/ansible.yml

@@ -0,0 +1,10 @@
+# Configure ArchLinux with Ansible.
+
+- hosts: localhost
+  tasks:
+    - name: Update package cache
+      pacman:
+        update_cache: yes
+        upgrade: yes
+
+    # ...

examples/SimpleArchLinux/goldboot.ron

@@ -0,0 +1,27 @@
+(
+  name: "Arch Linux example",
+  description: "Example of how to build a simple Arch Linux image",
+  arch: "x86_64",
+  size: "16 Gb",
+  source: Iso (
+    checksum: "sha1:3700a16d4fcabbd29e9a7fbc97da732c4577dc2a",
+    url: "https://mirrors.edge.kernel.org/archlinux/iso/latest/archlinux-2022.05.01-x86_64.iso",
+  ),
+  mold: ArchLinux (
+    hostname: "ExampleArch",
+    mirrorlist: [
+      "https://mirrors.edge.kernel.org/archlinux/$repo/os/$arch"
+    ],
+    root_password: "root",
+    packages: [
+      "alacritty",
+      "git",
+      "neovim",
+    ]
+  ),
+  fabricators: [
+    Ansible (
+      playbook: "ansible.yml"
+    )
+  ]
+)

goldboot-build/Cargo.toml → goldboot-foundry/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "goldboot-build"
+name = "goldboot-foundry"
 description = "Support for building goldboot images"
 version = "0.0.1"
 edition = "2021"
@@ -17,5 +17,9 @@ serde = { version = "1.0.190", features = ["derive"] }
 simple-error = "0.3.0"
 rand = "0.8.5"
 goldboot-image = { path="../goldboot-image", version = "0.0.1" }
+ron = "0.8.1"
+png = "0.17.10"
+vnc = "0.4.0"
+ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
 
 [dev-dependencies]

goldboot-build/src/lib.rs → goldboot-foundry/src/lib.rs

@@ -1,23 +1,19 @@
-use goldboot_image::{ImageHandle, qcow::Qcow3}
-use crate::{
-    library::ImageLibrary,
-    templates::{BuildTemplate, Template},
-};
+use goldboot_image::{qcow::Qcow3, ImageArch, ImageHandle};
 use log::{debug, info};
+use molds::Mold;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use simple_error::bail;
-use std::{error::Error, thread, time::SystemTime, fmt::Display};
+use std::{error::Error, fmt::Display, thread, time::SystemTime};
 use validator::Validate;
 
 // pub mod library;
-pub mod templates;
+pub mod molds;
 pub mod ovmf;
 
-
-/// The global configuration
+/// A `Foundry` produces a goldboot image given a configuration.
 #[derive(Clone, Serialize, Deserialize, Validate, Default, Debug)]
-pub struct BuildConfig {
+pub struct Foundry {
     /// The image name
     #[validate(length(min = 1, max = 64))]
     pub name: String,
@@ -29,7 +25,7 @@ pub struct BuildConfig {
 
     /// The system architecture
     #[serde(flatten)]
-    pub arch: Architecture,
+    pub arch: ImageArch,
 
     /// The amount of memory to allocate to the VM
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -45,7 +41,14 @@ pub struct BuildConfig {
     pub password: Option<String>,
 
     #[validate(length(min = 1))]
-    pub templates: Vec<Template>,
+    pub alloy: Vec<Template>,
+
+    pub source: Option<Source>,
+
+    pub mold: Option<Mold>,
+
+    #[validate(length(min = 1))]
+    pub fabricators: Option<Vec<Fabricator>>,
 }
 
 /// Represents an image build job.
@@ -102,27 +105,7 @@ impl BuildJob {
         // Unpack included firmware
         let ovmf_path = tmp.path().join("OVMF.fd").to_string_lossy().to_string();
 
-        match &self.config.arch {
-            Architecture::amd64 => {
-                std::fs::write(
-                    &ovmf_path,
-                    zstd::decode_all(std::io::Cursor::new(OVMF_X86_64))?,
-                )?;
-            }
-            Architecture::i386 => {
-                std::fs::write(
-                    &ovmf_path,
-                    zstd::decode_all(std::io::Cursor::new(OVMF_I386))?,
-                )?;
-            }
-            Architecture::arm64 => {
-                std::fs::write(
-                    &ovmf_path,
-                    zstd::decode_all(std::io::Cursor::new(OVMF_AARCH64))?,
-                )?;
-            }
-            _ => bail!("Unsupported architecture"),
-        }
+        crate::ovmf::write_to(&self.config.arch, &ovmf_path)?;
 
         Ok(BuildWorker {
             tmp,
@@ -262,43 +245,3 @@ impl BuildWorker {
         Ok(())
     }
 }
-
-/// Represents a system architecture.
-#[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq, Eq, EnumIter, Display)]
-#[serde(tag = "arch")]
-pub enum Architecture {
-    Amd64,
-    Arm64,
-    I386,
-    Mips,
-    Mips64,
-    S390x,
-}
-
-impl Default for Architecture {
-    fn default() -> Self {
-        match std::env::consts::ARCH {
-            "x86" => Architecture::I386,
-            "x86_64" => Architecture::Amd64,
-            "aarch64" => Architecture::Arm64,
-            "mips" => Architecture::Mips,
-            "mips64" => Architecture::Mips64,
-            "s390x" => Architecture::S390x,
-            _ => panic!("Unknown CPU architecture"),
-        }
-    }
-}
-
-impl TryFrom<String> for Architecture {
-    type Error = Box<dyn Error>;
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        match s.to_lowercase().as_str() {
-            "amd64" => Ok(Architecture::amd64),
-            "x86_64" => Ok(Architecture::amd64),
-            "arm64" => Ok(Architecture::arm64),
-            "aarch64" => Ok(Architecture::arm64),
-            "i386" => Ok(Architecture::i386),
-            _ => bail!("Unknown architecture"),
-        }
-    }
-}

goldboot-build/src/templates/arch_linux/mod.rs → goldboot-foundry/src/molds/arch_linux/mod.rs

@@ -1,4 +1,3 @@
-use crate::{build::BuildWorker, provisioners::*, qemu::QemuArgs, templates::*};
 use log::info;
 use serde::{Deserialize, Serialize};
 use simple_error::bail;
@@ -8,11 +7,12 @@ use std::{
 };
 use validator::Validate;
 
+/// This `Mold` produces an Arch Linux image.
 #[derive(Clone, Serialize, Deserialize, Validate, Debug)]
-pub struct ArchLinuxTemplate {
-    pub source: sources::ArchSource,
-    pub installer: installer::ArchLinuxInstaller,
-    pub provisioners: Option<Vec<provisioners::ArchProvisioner>>,
+pub struct ArchLinux {
+    pub root_password: Option<String>,
+    pub packages: Option<Vec<String>>,
+    pub mirrorlist: Option<Vec<String>>,
 }
 
 pub mod sources {
@@ -26,6 +26,14 @@ pub mod sources {
     }
 }
 
+pub mod installer {
+    pub struct ArchLinuxInstaller {}
+
+    impl Installer for ArchLinuxInstaller {
+        fn shutdown
+    }
+}
+
 impl Default for ArchLinuxTemplate {
     fn default() -> Self {
         Self {