Single application for service

justfile

@@ -186,15 +186,13 @@ web-dev-down:
 build-service-image crate_path bin model_dir="" ort_dir="":
     #!/usr/bin/env -S bash -eux -o pipefail
     docker build -f "{{crate_path}}/Dockerfile" \
-      --target {{bin}} \
       --build-arg MODEL_DIR="{{model_dir}}" \
       --build-arg ORT_DIR="{{ort_dir}}" \
       -t "xayn-{{crate_path}}-{{bin}}" {{justfile_directory()}}
 
 compose-all-build model="xaynia_v0201" ort="ort_v1.15.1":
     #!/usr/bin/env -S bash -eux -o pipefail
-    {{just_executable()}} build-service-image web-api personalization "assets/{{model}}" "assets/{{ort}}"
-    {{just_executable()}} build-service-image web-api ingestion "assets/{{model}}" "assets/{{ort}}"
+    {{just_executable()}} build-service-image web-api web-api "assets/{{model}}" "assets/{{ort}}"
 
 compose-all-up *args:
     #!/usr/bin/env -S bash -eux -o pipefail

web-api/Dockerfile

@@ -10,12 +10,10 @@ RUN --mount=type=bind,target=. cargo chef prepare --recipe-path ../recipe.json
 FROM chef AS builder
 COPY --from=planner /app/recipe.json recipe.json
 # Build dependencies - this is the caching Docker layer!
-RUN cargo chef cook --release --target-dir ../target --recipe-path recipe.json --bin ingestion && \
-    cargo chef cook --release --target-dir ../target --recipe-path recipe.json --bin personalization
+RUN cargo chef cook --release --target-dir ../target --recipe-path recipe.json --bin web-api
 # Build application
 COPY . .
-RUN cargo build --release --target-dir ../target --bin ingestion && \
-    cargo build --release --target-dir ../target --bin personalization
+RUN cargo build --release --target-dir ../target --bin web-api
 
 FROM debian:12.2-slim AS runtime
 WORKDIR /app
@@ -46,11 +44,7 @@ RUN --mount=type=bind,target=project set -eux; \
     esac; \
     cp -r project/assets/"$ORT_DIR"/linux_"$ORT_ARCH"/lib/* assets/lib
 
-FROM runtime AS ingestion
-COPY --from=builder /app/target/release/ingestion server.bin
-ENTRYPOINT ["/app/server.bin"]
-
-FROM runtime AS personalization
-COPY --from=builder /app/target/release/personalization server.bin
+FROM runtime AS service
+COPY --from=builder /app/target/release/web-api server.bin
 ENTRYPOINT ["/app/server.bin"]