diff --git a/.gitignore b/.gitignore index f478f21..149050f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,25 @@ -target -private_repos -log/ -*.tgz -.gitignore +### General ### +private_repos/ + +### Harmony ### +harmony.log + +### Helm ### +# Chart dependencies +**/charts/*.tgz + +### Rust ### +# Generated by Cargo +# will have compiled files and executables +debug/ +target/ + +# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries +# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html +Cargo.lock + +# These are backup files generated by rustfmt +**/*.rs.bk + +# MSVC Windows builds of rustc generate these, which store debugging information +*.pdb diff --git a/examples/rust/.gitignore b/examples/rust/.gitignore new file mode 100644 index 0000000..df77acc --- /dev/null +++ b/examples/rust/.gitignore @@ -0,0 +1,3 @@ +Dockerfile.harmony +.harmony_generated +harmony diff --git a/examples/rust/src/main.rs b/examples/rust/src/main.rs index 0b36621..c89a9f5 100644 --- a/examples/rust/src/main.rs +++ b/examples/rust/src/main.rs @@ -22,7 +22,7 @@ async fn main() { let application = Arc::new(RustWebapp { name: "harmony-example-rust-webapp".to_string(), domain: Url::Url(url::Url::parse("https://rustapp.harmony.example.com").unwrap()), - project_root: PathBuf::from("./examples/rust/webapp"), + project_root: PathBuf::from("./webapp"), // Relative from 'harmony-path' param framework: Some(RustWebFramework::Leptos), }); @@ -30,10 +30,10 @@ async fn main() { features: vec![ Box::new(ContinuousDelivery { application: application.clone(), - }), // TODO add monitoring, backups, multisite ha, etc + }), Box::new(Monitoring { application: application.clone(), - }), + }), // TODO: add backups, multisite ha, etc. ], application, }; diff --git a/examples/rust/webapp/Dockerfile.harmony b/examples/rust/webapp/Dockerfile.harmony deleted file mode 100644 index dffa3ac..0000000 --- a/examples/rust/webapp/Dockerfile.harmony +++ /dev/null @@ -1,16 +0,0 @@ -FROM rust:bookworm as builder -RUN apt-get update && apt-get install -y --no-install-recommends clang wget && wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && cp cargo-binstall /usr/local/cargo/bin && rm cargo-binstall-x86_64-unknown-linux-musl.tgz cargo-binstall && apt-get clean && rm -rf /var/lib/apt/lists/* -RUN cargo binstall cargo-leptos -y -RUN rustup target add wasm32-unknown-unknown -WORKDIR /app -COPY . . -RUN cargo leptos build --release -vv -FROM debian:bookworm-slim -RUN groupadd -r appgroup && useradd -r -s /bin/false -g appgroup appuser -ENV LEPTOS_SITE_ADDR=0.0.0.0:3000 -EXPOSE 3000/tcp -WORKDIR /home/appuser -COPY --from=builder /app/target/site/pkg /home/appuser/pkg -COPY --from=builder /app/target/release/harmony-example-rust-webapp /home/appuser/harmony-example-rust-webapp -USER appuser -CMD /home/appuser/harmony-example-rust-webapp \ No newline at end of file diff --git a/harmony_composer/src/main.rs b/harmony_composer/src/main.rs index 648977e..639ddc3 100644 --- a/harmony_composer/src/main.rs +++ b/harmony_composer/src/main.rs @@ -155,6 +155,7 @@ async fn compile_harmony( let cargo_exists = Command::new("which") .arg("cargo") + .stdout(Stdio::null()) .status() .expect("couldn't get `which cargo` status") .success();