Fix static linking segfaults by switching to rustls

spec-tacles · Aug 1, 2020 · c2971c4 · c2971c4
1 parent 9bcbaab
commit c2971c4
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM rust:alpine AS build
-WORKDIR /usr/src/proxy
-RUN apk add openssl-dev musl-dev \
-  && rustup default nightly
-COPY . .
-RUN cargo install --path ./bin
-
-FROM scratch
-COPY --from=build /usr/local/cargo/bin/spectacles-proxy-bin /proxy
-CMD ["/proxy"]
+FROM rust:alpine AS build
+WORKDIR /usr/src/proxy
+RUN apk add openssl-dev musl-dev \
+  && rustup default nightly
+COPY . .
+RUN cargo install --path ./bin
+
+FROM scratch
+COPY --from=build /usr/local/cargo/bin/spectacles-proxy-bin /proxy
+CMD ["/proxy"]
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -9,14 +9,18 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 log = "0.4"
-reqwest = { version = "0.10", features = ["json"] }
 serde = "1.0"
 serde_json = "1.0"
 tokio = { version = "0.2", features = ["blocking", "rt-core", "stream", "sync"] }
 uriparse = "0.6"
 
 redis = { version = "0.16", optional = true }
 
+[dependencies.reqwest]
+version = "0.10"
+features = ["json", "rustls-tls"]
+default-features = false
+
 [features]
 default = []
 redis-ratelimiter = [