simplified, removed unneeded checkouts, updated template (#14)

* simplified, removed unneeded checkouts, updated template

* improved init

* simplified slightly

* Update data/default.toml

---------

Co-authored-by: Funny <[email protected]>

Author: jackjohn7

data/basalt.Dockerfile

@@ -1,26 +1,18 @@
 FROM rust:1.84 as basalt-compilation
 
-RUN touch /redocly
-RUN chmod +x /redocly
+RUN touch /redocly && chmod +x /redocly
 ENV PATH=/:$PATH
 RUN git clone https://github.com/basalt-rs/basalt-server
 
 WORKDIR /basalt-server
 
-# TODO: remove
-RUN git checkout optional-docs
 RUN cargo build --release --no-default-features
 
 {% if web_client %}
 FROM node:22 as web-compilation
 
 RUN git clone https://github.com/basalt-rs/basalt /basalt
 
-# TODO: Remove
-WORKDIR /basalt
-# TODO: Remove
-RUN git checkout no-ssr
-
 WORKDIR /basalt/client
 RUN npm ci
 RUN npm run build
@@ -32,8 +24,7 @@ FROM fedora:rawhide as setup
 WORKDIR /setup
 
 COPY install.sh .
-RUN chmod +x install.sh
-RUN ./install.sh
+RUN chmod +x install.sh && ./install.sh
 
 FROM setup as execution
 

data/default.toml

@@ -9,12 +9,15 @@
 
 port = 8517
 
+# state whether the server should expose a web client
+web_client = true
+
 [setup]
 # import = "./setup.toml"
 
 # install = { import = "./install.sh" }
 install = '''
-dnf install opam
+dnf install opam -y
 '''
 
 # init = { import = "./init.sh" }

src/init.rs

@@ -32,23 +32,31 @@ pub async fn handle(path: Option<PathBuf>) -> anyhow::Result<()> {
         "basalt".to_owned()
     };
 
-    let path = path.map_or(PathBuf::from(&name), |p| {
-        if p.file_name().is_some() {
-            p
-        } else {
-            p.with_file_name(name.clone()).with_extension("toml")
-        }
-    });
+    let path = path
+        .map_or(PathBuf::from(&name), |p| {
+            if p.file_name().is_some() {
+                p
+            } else {
+                p.with_file_name(name.clone())
+            }
+        })
+        .with_extension("toml");
 
     let mut ctx = tera::Context::new();
     ctx.insert("name", &name);
     let content = tmpl
         .render("template", &ctx)
         .context("Failed to render template")?;
 
-    tokio::fs::write(path, content)
+    tokio::fs::write(&path, content)
         .await
         .context("Failed to write data")?;
 
+    println!(
+        "Initialized configuration at path: {}",
+        path.to_str()
+            .context("Created file but failed to generate report")?
+    );
+
     Ok(())
 }