Separate packages for core lib and server

Author: CharlesTaylor7

.dockerignore

@@ -1,3 +1,4 @@
 /target/
 /.env
 /node_modules/
+rust-toolchain.toml

.github/workflows/build.yml

@@ -43,5 +43,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

Cargo.lock

@@ -1,50 +1,8 @@
-[package]
-name = "citadels"
-edition = "2021"
-default-run = "citadels"
-version = "0.7.1"
-
-[[bin]]
-name = "citadels"
-path = "src/main.rs" 
-
-[dependencies]
-askama = { version = "0.12.1", default-features = false }
-axum = { version = "0.7.2", features = ["ws","macros"], default-features = true }
-axum-extra = { version = "0.9.0", features = ["cookie-private"], default-features = false }
-futures = { version = "0.3.30", default-features = false }
-http = { version = "1.0.0", default-features = false }
-rand = { version = "0.8.5", default-features = false }
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.14", default-features = false }
-tower = "0.4.13"
-tower-http = { version = "0.5.0", features = ["fs", "trace"] }
-log = "0.4.20"
-env_logger = { version = "0.10.1", features = ["color"] }
-rand_xoshiro = "0.6.0"
-rand_core = { version = "0.6.4", features = ["getrandom"] }
-serde = { version = "1.0.195", features = ["derive", "rc"] }
-serde_json = "1.0.111"
-time = "0.3.31"
-dotenv = { version = "0.15.0", optional = true }
-axum-core = "0.4.3"
-serde_with = "3.5.0"
-tracing = { version = "0.1.40", default-features = false }
-macros = { path = "./macros"}
-reqwest = { version = "0.12.4", features = ["json"], default-features = false }
-anyhow = { version = "1.0.83", default-features = true }
-maud = { version = "0.26.0", features = ["axum"], default-features = false}
-arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
-uuid = { version = "1.8.0", features = ["v4"] }
-thiserror = "1.0.61"
-
-[features]
-dev = []
-dotenv = ["dep:dotenv"]
-
-# https://old.reddit.com/r/rust/comments/gvrgca/this_is_a_neat_trick_for_getting_good_runtime/
-[profile.dev.package."*"]
-opt-level = 3
-
-[profile.dev]
-opt-level = 0
+[workspace]
+resolver = "2"
+members = [
+  "citadels_server", 
+  "citadels",
+  "macros",
+  "macros-impl"
+]

Cargo.toml

@@ -1,10 +1,6 @@
 # syntax=docker/dockerfile:1.3.1
 # https://github.com/LukeMathWalker/cargo-chef?tab=readme-ov-file#without-the-pre-built-image
-FROM rust:alpine AS chef
-RUN apk add --no-cache musl-dev
-RUN cargo --version
-RUN cargo install cargo-chef
-
+FROM lukemathwalker/cargo-chef:latest-rust-1.80.1 AS chef
 WORKDIR /app
 
 FROM chef AS planner
@@ -14,16 +10,15 @@ RUN cargo chef prepare --recipe-path recipe.json
 FROM chef AS builder 
 COPY --from=planner /app/recipe.json recipe.json
 
-COPY macros/ macros/
-COPY macros-impl/ macros-impl/
-
+# build dependencies
 RUN cargo chef cook --release --recipe-path recipe.json
-# Build application
+
+# build application
 COPY . .
-RUN cargo build --release --bin citadels
+RUN cargo build --release --bin citadels_server
 
-FROM alpine AS runtime
+FROM debian:bookworm-slim AS runtime
 WORKDIR /app
-COPY --from=builder /app/target/release/citadels /usr/local/bin
+COPY --from=builder /app/target/release/citadels_server /usr/local/bin
 COPY public/ public/
-ENTRYPOINT ["/usr/local/bin/citadels"]
+ENTRYPOINT ["/usr/local/bin/citadels_server"]

Dockerfile

@@ -0,0 +1,29 @@
+[package]
+name = "citadels"
+edition = "2021"
+
+
+[dependencies]
+rand = { version = "0.8.5" }
+log = "0.4.20"
+env_logger = { version = "0.10.1", features = ["color"] }
+rand_xoshiro = "0.6.0"
+
+rand_core = { version = "0.6.4", features = ["getrandom"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde_json = "1.0.111"
+time = "0.3.31"
+dotenv = { version = "0.15.0", optional = true }
+serde_with = "3.5.0"
+tracing = { version = "0.1.40", default-features = false }
+macros = { path = "../macros"}
+reqwest = { version = "0.12.4", features = ["json"], default-features = false }
+anyhow = { version = "1.0.83", default-features = true }
+maud = { version = "0.26.0", features = ["axum"], default-features = false}
+arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
+uuid = { version = "1.8.0", features = ["v4"] }
+thiserror = "1.0.61"
+
+[features]
+dev = []
+dotenv = ["dep:dotenv"]