From 3df5c6e7dadc01064069d7898858cf8b473641f9 Mon Sep 17 00:00:00 2001 From: Vidar Magnusson Date: Sun, 23 Jun 2024 02:51:39 +0200 Subject: [PATCH] Fix build flow --- backend/Cargo.lock | 11 +++++++++++ backend/Cargo.toml | 1 + backend/Dockerfile | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index ff83316..8feb7c3 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -628,6 +628,7 @@ dependencies = [ "mobc", "mobc-redis", "once_cell", + "openssl", "rand", "reqwest 0.11.27", "serde", @@ -2099,6 +2100,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.102" @@ -2107,6 +2117,7 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 8b39c8f..9d3cd09 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -26,6 +26,7 @@ reqwest = { version = "0.11.24", default-features = false, features = [ ] } serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" +openssl = { version = "0.10", features = ["vendored"] } slab = "0.4.9" sqlx = { version = "0.7.3", features = [ "runtime-tokio-rustls", diff --git a/backend/Dockerfile b/backend/Dockerfile index b21d880..df67307 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -17,7 +17,7 @@ RUN cargo install strip_cargo_version RUN rustup target add x86_64-unknown-linux-musl # Required by `brotli-sys` -RUN apt-get update && apt-get install -y musl-tools +RUN apt-get update && apt-get install -y musl-tools pkg-config libssl-dev ########################### ### STRIP-VERSION STAGE ###