Merge pull request #1163 from anonkey/fix-docker-build

build: fix dockerfile
sozu-proxy · Dec 26, 2024 · 8bc671d · 8bc671d
2 parents c5ff06a + 93a4ea4
commit 8bc671d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 180 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,8 @@ RUN apk add --no-cache llvm-libunwind \
 COPY . /usr/src/sozu
 WORKDIR /usr/src/sozu
 
-RUN cargo vendor --locked
+RUN mkdir .cargo
+RUN cargo vendor --locked >.cargo/config.toml
 RUN cargo build --release --frozen
 
 FROM alpine:$ALPINE_VERSION as bin
@@ -38,8 +39,6 @@ RUN apk update && apk add --no-cache \
 
 COPY --from=builder /usr/src/sozu/target/release/sozu /usr/local/bin/sozu
 COPY os-build/config.toml /etc/sozu/config.toml
-COPY lib/assets/404.html /etc/sozu/html/404.html
-COPY lib/assets/503.html /etc/sozu/html/503.html
 
 ENTRYPOINT ["/usr/local/bin/sozu"]
 CMD ["start", "-c", "/etc/sozu/config.toml"]
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -42,7 +42,12 @@ nom = { version = "^7.1.3", default-features = true, features = ["std"] }
 poule = "^0.3.2"
 rand = "^0.8.5"
 regex = "^1.11.0"
-rustls = { version = "^0.23.14", features = ["ring"] }
+rustls = { version = "^0.23.14", default-features = false, features = [
+  "ring",
+  "logging",
+  "std",
+  "tls12",
+] }
 rustls-pemfile = "^2.2.0"
 rusty_ulid = "^2.0.0"
 sha2 = "^0.10.8"