From 66813011662678fb0e443ce2c415c681dc382e40 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 8 Sep 2023 17:32:48 +1000 Subject: [PATCH] fix(relay): use system cert store for root certificates (#1999) --- rust/Cargo.lock | 1 + rust/Dockerfile | 2 +- rust/relay/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3f9988659..0615d70bb 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -3849,6 +3849,7 @@ dependencies = [ "pin-project", "prost", "prost-derive", + "rustls-native-certs", "rustls-pemfile", "tokio", "tokio-rustls 0.23.4", diff --git a/rust/Dockerfile b/rust/Dockerfile index 254c290e1..9f25fcb0f 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -20,7 +20,7 @@ ENV RUST_BACKTRACE=1 ENV PATH "/app:$PATH" ENV PACKAGE_NAME ${PACKAGE} RUN apt-get update -y \ - && apt-get install -y iputils-ping iptables lsof iproute2 curl iperf3 \ + && apt-get install -y iputils-ping iptables lsof iproute2 curl iperf3 ca-certificates \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/rust/relay/Cargo.toml b/rust/relay/Cargo.toml index 627e06c30..a0c6d3984 100644 --- a/rust/relay/Cargo.toml +++ b/rust/relay/Cargo.toml @@ -16,7 +16,7 @@ tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "net", "t tracing = { version = "0.1.37", features = ["log"] } tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "fmt"] } tracing-stackdriver = { version = "0.7.2", features = ["opentelemetry"] } -opentelemetry-stackdriver = { version = "0.16.0", default-features = false, features = ["gcp_auth"] } +opentelemetry-stackdriver = { version = "0.16.0", default-features = false, features = ["gcp_auth", "tls-native-roots"] } tracing-opentelemetry = "0.19.0" opentelemetry = { version = "0.19.0", features = ["rt-tokio"] } env_logger = "0.10.0"