fix openssl
All checks were successful
Build and Test / account (push) Successful in 8m0s

This commit is contained in:
Maple Nebel 2026-05-02 13:42:03 +02:00
commit 8d6a90df79
4 changed files with 11 additions and 7 deletions

8
Cargo.lock generated
View file

@ -607,6 +607,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cfg_aliases"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]] [[package]]
name = "chacha20" name = "chacha20"
version = "0.10.0" version = "0.10.0"
@ -3905,7 +3911,7 @@ dependencies = [
"rand 0.8.5", "rand 0.8.5",
"rsa", "rsa",
"serde", "serde",
"sha1", "sha1 0.10.6",
"sha2 0.10.9", "sha2 0.10.9",
"smallvec", "smallvec",
"sqlx-core", "sqlx-core",

View file

@ -53,6 +53,6 @@ sha256 = "1.6.0"
p256 = "0.13.2" p256 = "0.13.2"
k256 = "0.13.4" k256 = "0.13.4"
dsa = "0.6.3" dsa = "0.6.3"
openssl = "0.10.78" openssl = {version = "0.10.78", features = ["vendored"]}
time = "0.3.47" time = "0.3.47"
hickory-resolver = { version = "0.24", features = ["tokio-runtime"] } hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }

View file

@ -2,7 +2,7 @@
FROM rust:alpine as builder FROM rust:alpine as builder
RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static protobuf-dev lld RUN apk add --no-cache musl-dev openssl-dev openssl-libs-static protobuf-dev lld perl make
WORKDIR /app WORKDIR /app
@ -16,7 +16,7 @@ COPY . .
RUN touch src/main.rs RUN touch src/main.rs
ENV SQLX_OFFLINE=true ENV SQLX_OFFLINE=true
RUN OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include/openssl OPENSSL_STATIC=1 RUSTFLAGS="-C target-feature=+aes,+sse -C relocation-model=static -C linker=ld.lld" cargo build --profile prod --target x86_64-unknown-linux-musl RUN RUSTFLAGS="-C target-feature=+aes,+sse -C relocation-model=static -C linker=ld.lld" cargo build --profile prod --target x86_64-unknown-linux-musl
FROM scratch AS final FROM scratch AS final

View file

@ -57,8 +57,6 @@ pub async fn get_service_token(pool: &State<Pool>, auth: Auth<true, false>) -> R
let token = create_token(pool, auth.pid, NEX_TOKEN, None).await; let token = create_token(pool, auth.pid, NEX_TOKEN, None).await;
Ok( Ok(
Xml( Xml(
ServiceToken{ ServiceToken{