The Cleansing

.vscode/settings.json

@@ -1,16 +1,4 @@
 {
-  "sqltools.connections": [
-    {
-      "previewLimit": 50,
-      "server": "localhost",
-      "port": 5432,
-      "driver": "PostgreSQL",
-      "name": "anda",
-      "database": "anda",
-      "username": "postgres",
-      "password": "example"
-    }
-  ],
   "rust-analyzer.checkOnSave.command": "clippy",
   "search.useGlobalIgnoreFiles": true,
   "files.exclude": {

Cargo.toml

@@ -7,7 +7,7 @@ description = "Andaman Build toolchain"
 license = "MIT"
 repository = "https://github.com/FyraLabs/anda"
 readme = "README.md"
-keywords = ["build", "toolchain", "rpm", "flatpak", "oci"]
+keywords = ["build", "toolchain", "rpm"]
 exclude = [
     "anda-build",
     "anda-config",
@@ -29,7 +29,6 @@ walkdir = "2.5.0"
 tempfile = "3.14.0"
 anda-config = { workspace = true }
 andax = { path = "./andax", version = "0.3.1" }
-flatpak = "0.18.1"
 clap-verbosity-flag = "2.2.2"
 tokio = { version = "1.41.1", features = [
     "process",

anda-config/config.rs

@@ -50,9 +50,6 @@ impl Manifest {
 #[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)]
 pub struct Project {
     pub rpm: Option<RpmBuild>,
-    pub podman: Option<Docker>,
-    pub docker: Option<Docker>,
-    pub flatpak: Option<Flatpak>,
     pub pre_script: Option<PathBuf>,
     pub post_script: Option<PathBuf>,
     pub env: Option<BTreeMap<String, String>>,
@@ -191,11 +188,6 @@ pub struct RpmBuild {
     pub opts: Option<BTreeMap<String, String>>,
 }
 
-#[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)]
-pub struct Docker {
-    pub image: BTreeMap<String, DockerImage>, // tag, file
-}
-
 pub fn parse_kv(input: &str) -> impl Iterator<Item = Option<(String, String)>> + '_ {
     input
         .split(',')
@@ -212,22 +204,6 @@ pub fn parse_labels<'a, I: Iterator<Item = &'a str>>(labels: I) -> Option<Vec<(S
     labels.flat_map(parse_kv).collect()
 }
 
-#[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)]
-pub struct DockerImage {
-    pub dockerfile: Option<String>,
-    pub import: Option<PathBuf>,
-    pub tag_latest: Option<bool>,
-    pub context: String,
-    pub version: Option<String>,
-}
-
-#[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone)]
-pub struct Flatpak {
-    pub manifest: PathBuf,
-    pub pre_script: Option<PathBuf>,
-    pub post_script: Option<PathBuf>,
-}
-
 /// Converts a [`Manifest`] to `String` (.hcl).
 ///
 /// # Errors

andax/fns/cfg.rs

@@ -28,9 +28,6 @@ pub mod ar {
             p.insert(name.into(), {
                 let mut p = rhai::Map::new();
                 p.insert("rpm".into(), _rpm(proj.rpm));
-                p.insert("podman".into(), _docker(proj.podman));
-                p.insert("docker".into(), _docker(proj.docker));
-                p.insert("flatpak".into(), _flatpak(proj.flatpak));
                 p.insert("pre_script".into(), _pb(proj.pre_script));
                 p.insert("post_script".into(), _pb(proj.post_script));
                 p.insert("env".into(), proj.env.unwrap_or_default().into());
@@ -67,33 +64,3 @@ fn _rpm(o: Option<anda_config::RpmBuild>) -> Dynamic {
         m.into()
     })
 }
-fn _docker(o: Option<anda_config::Docker>) -> Dynamic {
-    o.map_or(().into(), |d| {
-        let mut m = rhai::Map::new();
-        m.insert(
-            "image".into(),
-            d.image
-                .into_iter()
-                .map(|(n, i)| {
-                    let mut a = rhai::Map::new();
-                    a.insert("dockerfile".into(), i.dockerfile.unwrap_or_default().into());
-                    a.insert("import".into(), _pb(i.import));
-                    a.insert("tag_latest".into(), i.tag_latest.unwrap_or(false).into());
-                    a.insert("context".into(), i.context.into());
-                    a.insert("version".into(), i.version.unwrap_or_default().into());
-                    (n, a)
-                })
-                .collect(),
-        );
-        m.into()
-    })
-}
-fn _flatpak(o: Option<anda_config::Flatpak>) -> Dynamic {
-    o.map_or(().into(), |f| {
-        let mut m = rhai::Map::new();
-        m.insert("manifest".into(), _pb(Some(f.manifest)));
-        m.insert("pre_script".into(), _pb(f.pre_script));
-        m.insert("post_script".into(), _pb(f.post_script));
-        m.into()
-    })
-}