Skip to content

cleanup: ship controller bin from query-backend image (single-binary Phase 9) #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzylol merged 1 commit into from
May 11, 2026
Merged

cleanup: ship controller bin from query-backend image (single-binary Phase 9) #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions deploy/docker-compose/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,12 @@ services:

# ───────── ASAP control / query plane ─────────
controller:
build:
context: ../..
dockerfile: deploy/docker/Dockerfile.controller
# Phase-9 single-binary refactor (2026-05): the controller crate
# moved into ASAPQuery-backend; the asap/query-backend:dev image
# now ships both bins. Build instructions for that image are in
# the `backend:` block below.
image: asap/query-backend:dev
entrypoint: ["/usr/local/bin/controller"]
environment:
CONTROLLER_ADDR: "0.0.0.0:8080"
CONTROLLER_OPAMP_ADDR: "0.0.0.0:4320"
Expand Down
13 changes: 10 additions & 3 deletions deploy/docker/Dockerfile.backend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ COPY --from=asap-sketchlib . asap_sketchlib
# Mirrors the asap-precompute-rs pattern.
COPY --from=asap-gorilla-rust . ASAPCollector/asap-gorilla-rust

RUN cd ASAPQuery-backend && cargo build --release --bin query_engine_rust
RUN cd ASAPQuery-backend && cargo build --release --bin query_engine_rust --bin controller

# Runtime image: binary + CA certs.
# Runtime image: binaries + CA certs.
FROM debian:bookworm-slim
RUN apt-get update && \
apt-get install -y --no-install-recommends ca-certificates && \
Expand All @@ -82,10 +82,17 @@ RUN apt-get update && \
RUN mkdir -p /var/log/asap
COPY --from=build /src/ASAPQuery-backend/target/release/query_engine_rust \
/usr/local/bin/asap-query-backend
# Phase-9 single-binary refactor (2026-05): the controller crate
# moved into ASAPQuery-backend, so the controller binary now ships
# from this image too. base.yml's `controller:` service points at
# `asap/query-backend:dev` and overrides ENTRYPOINT to
# `/usr/local/bin/controller`.
COPY --from=build /src/ASAPQuery-backend/target/release/controller \
/usr/local/bin/controller

ENV RUST_LOG=info \
ASAP_BACKEND_PORT=9090 \
ASAP_BACKEND_METRICS_PORT=9465

EXPOSE 9090 9465
EXPOSE 9090 9465 8080 4320 4321
ENTRYPOINT ["/usr/local/bin/asap-query-backend"]