setup web client (#7)

Author: funnyboy-roks

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.95"
 clap = { version = "4.5.27", features = ["derive"] }
-bedrock = { git = "http://github.com/basalt-rs/bedrock.git", rev = "90122c8", features = ["tokio"] }
+bedrock = { git = "http://github.com/basalt-rs/bedrock.git", rev = "f8ce557", features = ["tokio"] }
 tokio = { version = "1.43.0", features = ["full"] }
 lazy_static = "1.5.0"
 tera = "1.20.0"

Cargo.toml

@@ -1,10 +1,30 @@
 FROM rust:1.84 as basalt-compilation
 
+RUN touch /redocly
+RUN chmod +x /redocly
+ENV PATH=/:$PATH
 RUN git clone https://github.com/basalt-rs/basalt-server
 
 WORKDIR /basalt-server
 
-RUN cargo build --release
+# 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
+{% endif %}
 
 # DO NOT EDIT UNLESS YOU KNOW WHAT YOU'RE DOING
 FROM fedora:rawhide as setup
@@ -20,11 +40,18 @@ FROM setup as execution
 WORKDIR /execution
 
 COPY --from=basalt-compilation /basalt-server/target/release/basalt-server .
+{% if web_client %}
+COPY --from=web-compilation /basalt/client/out ./web/
+{% endif %}
 
 COPY config.toml .
 COPY entrypoint.sh .
 RUN chmod +x ./entrypoint.sh
 
 EXPOSE 9090
 ENTRYPOINT [ "./entrypoint.sh" ]
+{% if web_client %}
+CMD [ "./basalt-server", "run", "--port", "9090", "./config.toml", "-w", "./web/" ]
+{% else %}
 CMD [ "./basalt-server", "run", "--port", "9090", "./config.toml" ]
+{% endif %}

data/basalt.Dockerfile

@@ -57,44 +57,55 @@ pub async fn build_with_output(
             ctx.insert("custom_init", init.trim());
         }
     }
+    ctx.insert("web_client", &cfg.web_client);
+
     let install_content = tmpl
         .render("install.sh", &ctx)
         .context("Failed to render installation script")?;
+
     let entrypoint_content = tmpl
         .render("entrypoint.sh", &ctx)
         .context("Failed to render entrypoint script")?;
+
     dbg!(&install_content);
+
     let content = tmpl
         .render("dockerfile", &ctx)
         .context("Failed to render dockerfile")?;
+
     let config_header = make_header("config.toml", config_content.len() as u64, 0o644)
         .context("Failed to create config header")?;
     tarball
         .append(&config_header, config_content.as_bytes())
         .await
         .context("Failed to archive config.toml")?;
+
     let dockerfile_header = make_header("Dockerfile", content.len() as u64, 0o644)
         .context("Failed to create dockerfile header")?;
     tarball
         .append(&dockerfile_header, content.as_bytes())
         .await
         .context("Failed to append dockerfile to tarball")?;
+
     let install_header = make_header("install.sh", install_content.len() as u64, 0o644)
         .context("Failed to create install header")?;
     tarball
         .append(&install_header, install_content.as_bytes())
         .await
         .context("Failed to append install.sh to tarball")?;
+
     let entrypoint_header = make_header("entrypoint.sh", entrypoint_content.len() as u64, 0o644)
         .context("Failed to create entrypoint header")?;
     tarball
         .append(&entrypoint_header, entrypoint_content.as_bytes())
         .await
         .context("Failed to append entrypoint.sh to tar")?;
+
     let out_data = tarball
         .into_inner()
         .await
         .context("Failed to finish tarball")?;
+
     match output {
         Some(out_path) => {
             tokio::fs::write(out_path, out_data)