Skip to content

Commit 2cddd07

Browse files
authored
Upgrade dependencies, base images and rust version (#789)
Signed-off-by: Sergio Castaño Arteaga <[email protected]>
1 parent 7b36cf8 commit 2cddd07

File tree

14 files changed

+102
-58
lines changed

14 files changed

+102
-58
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Rust
1616
uses: dtolnay/rust-toolchain@master
1717
with:
18-
toolchain: 1.88.0
18+
toolchain: 1.89.0
1919
components: clippy, rustfmt
2020
- name: Run clippy
2121
run: cargo clippy --all-targets --all-features -- --deny warnings

Cargo.lock

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

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ members = [
99
[workspace.package]
1010
version = "1.0.0"
1111
license = "Apache-2.0"
12-
edition = "2021"
13-
rust-version = "1.88"
12+
edition = "2024"
13+
rust-version = "1.89"
1414

1515
[workspace.dependencies]
16-
anyhow = "1.0.98"
16+
anyhow = "1.0.99"
1717
async-trait = "0.1.88"
1818
axum = { version = "0.8.4", features = ["macros"] }
1919
bincode = { version = "2.0.1", features = ["serde"] }
20-
clap = { version = "4.5.41", features = ["derive"] }
21-
config = "0.15.13"
20+
clap = { version = "4.5.45", features = ["derive"] }
21+
config = "0.15.14"
2222
deadpool = "0.12.2"
2323
deadpool-postgres = { version = "0.14.1", features = ["serde"] }
2424
futures = "0.3.31"
@@ -33,9 +33,9 @@ openssl = { version = "0.10.73", features = ["vendored"] }
3333
postgres-openssl = "0.5.1"
3434
postgres-types = { version = "0.2.9", features = ["derive"] }
3535
regex = "1.11.1"
36-
reqwest = { version = "0.12.22", features = ["json"] }
36+
reqwest = { version = "0.12.23", features = ["json"] }
3737
serde = { version = "1.0.219", features = ["derive"] }
38-
serde_json = "1.0.140"
38+
serde_json = "1.0.142"
3939
serde_qs = "0.15.0"
4040
serde_yaml = "0.9.34"
4141
sha2 = "0.10.9"
@@ -45,7 +45,7 @@ time = { version = "0.3.41", features = [
4545
"parsing",
4646
"serde",
4747
] }
48-
tokio = { version = "1.46.1", features = [
48+
tokio = { version = "1.47.1", features = [
4949
"macros",
5050
"process",
5151
"rt-multi-thread",
@@ -61,4 +61,4 @@ tower = { version = "0.5.1", features = ["util"] }
6161
tower-http = { version = "0.6.6", features = ["fs", "set-header", "trace"] }
6262
tracing = "0.1.41"
6363
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
64-
uuid = { version = "1.17.0", features = ["serde"] }
64+
uuid = { version = "1.18.0", features = ["serde"] }

clotributor-apiserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN yarn install --network-concurrency 1
2020
RUN yarn build
2121

2222
# Final stage
23-
FROM alpine:3.22.0
23+
FROM alpine:3.22.1
2424
RUN apk --no-cache add ca-certificates && addgroup -S clotributor && adduser -S clotributor -G clotributor
2525
USER clotributor
2626
WORKDIR /home/clotributor

clotributor-apiserver/src/handlers.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ use std::{fmt::Display, path::Path, sync::Arc};
22

33
use anyhow::{Error, Result};
44
use axum::{
5+
Router,
56
body::Body,
67
extract::{FromRef, RawQuery, State},
78
http::{
8-
header::{CACHE_CONTROL, CONTENT_TYPE},
99
HeaderValue, Response, StatusCode,
10+
header::{CACHE_CONTROL, CONTENT_TYPE},
1011
},
1112
response::IntoResponse,
1213
routing::{get, get_service},
13-
Router,
1414
};
1515
use config::Config;
1616
use mime::APPLICATION_JSON;
@@ -120,7 +120,7 @@ mod tests {
120120
use super::*;
121121
use crate::db::MockDB;
122122
use axum::{
123-
body::{to_bytes, Body},
123+
body::{Body, to_bytes},
124124
http::Request,
125125
};
126126
use futures::future;

clotributor-apiserver/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ async fn main() -> Result<()> {
4040

4141
// Setup logging
4242
if std::env::var_os("RUST_LOG").is_none() {
43-
std::env::set_var("RUST_LOG", "clotributor_apiserver=debug,tower_http=debug");
43+
unsafe {
44+
std::env::set_var("RUST_LOG", "clotributor_apiserver=debug,tower_http=debug");
45+
}
4446
}
4547
let s = tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env());
4648
match cfg.get_string("log.format").as_deref() {

clotributor-registrar/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /clotributor/clotributor-registrar
1010
RUN cargo build --release
1111

1212
# Final stage
13-
FROM alpine:3.22.0
13+
FROM alpine:3.22.1
1414
RUN apk --no-cache add ca-certificates && addgroup -S clotributor && adduser -S clotributor -G clotributor
1515
USER clotributor
1616
WORKDIR /home/clotributor

clotributor-registrar/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ async fn main() -> Result<()> {
3737

3838
// Setup logging
3939
if std::env::var_os("RUST_LOG").is_none() {
40-
std::env::set_var("RUST_LOG", "clotributor_registrar=debug");
40+
unsafe {
41+
std::env::set_var("RUST_LOG", "clotributor_registrar=debug");
42+
}
4143
}
4244
let s = tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env());
4345
match cfg.get_string("log.format").as_deref() {

0 commit comments

Comments
 (0)