Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
210 changes: 76 additions & 134 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion asap-planner-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ clap.workspace = true
indexmap.workspace = true
chrono.workspace = true
promql-parser = "0.5.0"
reqwest = { version = "0.11", features = ["blocking", "json"] }
reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] }

[dev-dependencies]
tempfile = "3.20"
Expand Down
2 changes: 1 addition & 1 deletion asap-query-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ regex = "1"
prometheus = "0.13"
lazy_static = "1.4"
zstd = "0.13"
reqwest = { version = "0.11", features = ["json"] }
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
tracing-appender = "0.2"
elastic_dsl_utilities.workspace = true
asap_sketchlib = { git = "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/ProjectASAP/asap_sketchlib" }
Expand Down
12 changes: 10 additions & 2 deletions asap-quickstart/Dockerfile.queryengine-local
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# Lightweight image that copies a pre-built query engine binary
# Lightweight image that copies a pre-built query engine binary.
#
# `reqwest` was switched to rustls-tls (see query_engine_rust/Cargo.toml
# and asap-planner-rs/Cargo.toml), so the binary no longer links against
# libssl at runtime. Any modern glibc base (Ubuntu 22.04+ or Debian 12+)
# works; we pin the LTS 24.04 for a stable default. `ca-certificates`
# is only needed if outbound TLS is made to hosts whose leaf certs
# aren't chained via webpki-roots — rustls-tls embeds Mozilla's bundle,
# so it's belt-and-suspenders for the common case.
FROM ubuntu:24.04

WORKDIR /app

RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates libssl3 zlib1g \
ca-certificates zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY asap-quickstart/bin/query_engine_rust /usr/local/bin/query_engine_rust
Expand Down