diff --git a/Cargo.lock b/Cargo.lock index 3522dd1..a969166 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1411,9 +1411,9 @@ checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3" [[package]] name = "const-str" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d34b8f066904ed7cfa4a6f9ee96c3214aa998cb44b69ca20bd2054f47402ed" +checksum = "b0664d2867b4a32697dfe655557f5c3b187e9b605b38612a748e5ec99811d160" [[package]] name = "const_format" @@ -2477,7 +2477,7 @@ dependencies = [ "base64 0.22.1", "bytes", "ciborium", - "const-str 0.7.0", + "const-str 0.7.1", "const_format", "content_disposition", "derive_more 2.1.0", @@ -5567,7 +5567,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jacquard" version = "0.9.4" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "bytes", "getrandom 0.2.16", @@ -5599,7 +5599,7 @@ dependencies = [ [[package]] name = "jacquard-api" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "bon", "bytes", @@ -5618,7 +5618,7 @@ dependencies = [ [[package]] name = "jacquard-axum" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "axum", "bytes", @@ -5640,7 +5640,7 @@ dependencies = [ [[package]] name = "jacquard-common" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "base64 0.22.1", "bon", @@ -5688,7 +5688,7 @@ dependencies = [ [[package]] name = "jacquard-derive" version = "0.9.4" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "heck 0.5.0", "jacquard-lexicon", @@ -5700,7 +5700,7 @@ dependencies = [ [[package]] name = "jacquard-identity" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "bon", "bytes", @@ -5729,7 +5729,7 @@ dependencies = [ [[package]] name = "jacquard-lexicon" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "cid", "dashmap 6.1.0", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "jacquard-oauth" version = "0.9.2" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "base64 0.22.1", "bytes", @@ -5788,7 +5788,7 @@ dependencies = [ [[package]] name = "jacquard-repo" version = "0.9.4" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "bytes", "cid", @@ -6746,7 +6746,7 @@ dependencies = [ [[package]] name = "mini-moka" version = "0.10.99" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#d5d29a337d8f08ae52fe7bb4e31f91f8b029ff48" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#bf8f91add8747b64b1d1d74af4b358960f69d6e7" dependencies = [ "crossbeam-channel", "crossbeam-utils", diff --git a/crates/weaver-app/Dockerfile b/crates/weaver-app/Dockerfile index dd47f40..50f3476 100644 --- a/crates/weaver-app/Dockerfile +++ b/crates/weaver-app/Dockerfile @@ -1,20 +1,18 @@ -# Build stage with cargo-chef for dependency caching -FROM rust:1-trixie AS chef -# Pin nightly version for reproducibility -RUN rustup default nightly-2025-12-04 && rustup component add rust-src --toolchain nightly-2025-12-04 -RUN cargo install cargo-chef -WORKDIR /app +# Build stage +FROM rust:1-trixie AS builder -FROM chef AS planner -COPY . . -RUN cargo chef prepare --recipe-path recipe.json +WORKDIR /app -FROM chef AS builder +# Pin nightly version for reproducibility +RUN rustup default nightly-2025-12-04 && rustup component add rust-src llvm-tools-preview --toolchain nightly-2025-12-04 # Install build dependencies RUN apt-get update && apt-get install -y \ pkg-config \ libssl-dev \ + clang \ + llvm \ + binutils \ && rm -rf /var/lib/apt/lists/* # Install wasm target and tools @@ -25,10 +23,6 @@ RUN cargo install wasm-bindgen-cli RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash RUN cargo binstall dioxus-cli --root /usr/local -y --force -# Cook dependencies first (cached layer) -COPY --from=planner /app/recipe.json recipe.json -RUN cargo chef cook --release --recipe-path recipe.json - # Copy source code COPY . . @@ -51,10 +45,10 @@ RUN wasm-bindgen target/wasm32-unknown-unknown/release/embed_worker.wasm \ --no-typescript # Bundle the app -RUN dx bundle --release --debug-symbols false -p weaver-app +RUN dx bundle --verbose --release --debug-symbols false -p weaver-app # Runtime stage -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN apt-get update && apt-get install -y \ ca-certificates \ diff --git a/crates/weaver-app/assets/fonts/cmu-sans-serif/CMUSansSerif-Bold.ttf b/crates/weaver-app/assets/fonts/cmu-sans-serif/CMUSansSerif-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..53d642cba4316eaa1b0b1e44733906a47bbcaa06 GIT binary patch literal 200524 zcmZNyWME(rW@KPsVK8uW3-OKdl{wD9z-Yt3z#!x9;_Alzi<6mwfiZ%Cfg#L2z(3ej z{_6_{2F48x3)I^>@UUdeh`!^UE7*sNH zODX~bANesb-T%YDz_l(XKRJ=PZ!H4@)2lTM3|w1s6Dtas&oY-WFnvv6U|>+lOUzA8 zy4tjff$3`l0|SdgL4I+G`>}9#2Bx0}7#KuW6cnWvJbY
mo7#NPluYV4r&m{j{2bSSuU|{eAi7+rRa4|44EMZ_|
zSjw=1fr()y!yX1khP@1X8JHOMG2CHbWVp+4mw}1l9>W6$MuvwB4;h#k9x*LrU}Rd(
zw3>m5frWvAfeCC9D89HDLKyNGSX|tELKviyD~oa%)Y6Mmvl)zX5=-(J?7*rS{{IKN
z0i+YcW<(N4Wiw@`7UePUfk_dVuNW8^7#Wxt*ckZ0HZw8^KxoDw21Z6FuvttDd<;t%
zR2kI%A7s$_e~`iG|3L MX1T#uaHD`RXuOIUQgUr{1PvYQfTo#=FTqS;mxr5+h#8xi
zo2i5M2J^8KNQ5WvLT(GMx3mosmt-_Yz9pQ9qHP!SlJE`odgvE}GlA1#IXfGJ3WFQy
zY({WX5xHKo)ZgG@yiteqsuJ&IO
zS!MYIma~TX5x-}#vBZhXswr~mLhWW3XYFOMWN={EWC{v1F=&|a8#8XO0$Xgv{c?km
zz(yHH?Ty0RFE?5Tl!(`B7Yd1M{_w0z5A_F@u)kF)%Z5YHwgSf-mW^W)xIb
zGKCDgfjZEP%8E+HG5NW1F^r0e+I%c5y4wHl#{Bc~V!PtyBcv)R^5dAa0wnGk
byvc)+8