Skip to content

Commit c2971c4

Browse files
author
Will Nelson
committed
Fix static linking segfaults by switching to rustls
1 parent 9bcbaab commit c2971c4

File tree

3 files changed

+129
-23
lines changed

3 files changed

+129
-23
lines changed

Cargo.lock

Lines changed: 114 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM rust:alpine AS build
2-
WORKDIR /usr/src/proxy
3-
RUN apk add openssl-dev musl-dev \
4-
&& rustup default nightly
5-
COPY . .
6-
RUN cargo install --path ./bin
7-
8-
FROM scratch
9-
COPY --from=build /usr/local/cargo/bin/spectacles-proxy-bin /proxy
10-
CMD ["/proxy"]
1+
FROM rust:alpine AS build
2+
WORKDIR /usr/src/proxy
3+
RUN apk add openssl-dev musl-dev \
4+
&& rustup default nightly
5+
COPY . .
6+
RUN cargo install --path ./bin
7+
8+
FROM scratch
9+
COPY --from=build /usr/local/cargo/bin/spectacles-proxy-bin /proxy
10+
CMD ["/proxy"]

core/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ edition = "2018"
99
[dependencies]
1010
anyhow = "1.0"
1111
log = "0.4"
12-
reqwest = { version = "0.10", features = ["json"] }
1312
serde = "1.0"
1413
serde_json = "1.0"
1514
tokio = { version = "0.2", features = ["blocking", "rt-core", "stream", "sync"] }
1615
uriparse = "0.6"
1716

1817
redis = { version = "0.16", optional = true }
1918

19+
[dependencies.reqwest]
20+
version = "0.10"
21+
features = ["json", "rustls-tls"]
22+
default-features = false
23+
2024
[features]
2125
default = []
2226
redis-ratelimiter = [

0 commit comments

Comments
 (0)