From 1fb7f3bb54d30ad60744478293d59662782d03a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Tue, 10 Dec 2024 09:52:39 +0100 Subject: [PATCH] Upgrade backend dependencies and base images (#293) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- Cargo.lock | 52 +++++++++++++++++----------------- Cargo.toml | 14 ++++----- clowarden-server/Dockerfile | 6 ++-- database/migrations/Dockerfile | 4 +-- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97c63e2..92dacbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "as-any" @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clowarden-cli" @@ -509,7 +509,7 @@ dependencies = [ "serde_qs", "serde_yaml", "sha2", - "thiserror 2.0.3", + "thiserror 2.0.6", "time", "tokio", "tokio-postgres", @@ -2417,11 +2417,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.6", ] [[package]] @@ -2437,9 +2437,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", @@ -2458,9 +2458,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2479,9 +2479,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -2504,9 +2504,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -2582,9 +2582,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -2736,9 +2736,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" dependencies = [ "serde", "tracing-core", @@ -2746,9 +2746,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", diff --git a/Cargo.toml b/Cargo.toml index 3099779..b3eb3a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,14 +13,14 @@ edition = "2021" rust-version = "1.82" [workspace.dependencies] -anyhow = "1.0.93" +anyhow = "1.0.94" as-any = "0.3.1" askama = "0.12.1" async-trait = "0.1.83" axum = { version = "0.7.9", features = ["macros"] } base64 = "0.22.1" cached = { version = "0.54.0", features = ["async"] } -clap = { version = "4.5.21", features = ["derive"] } +clap = { version = "4.5.23", features = ["derive"] } clowarden-core = { path = "../clowarden-core" } deadpool-postgres = { version = "0.14.0", features = ["serde"] } figment = { version = "0.10.19", features = ["yaml", "env"] } @@ -40,14 +40,14 @@ serde_json = "1.0.133" serde_qs = "0.13.0" serde_yaml = "0.9.34" sha2 = "0.10.8" -thiserror = "2.0.3" -time = { version = "0.3.36", features = [ +thiserror = "2.0.6" +time = { version = "0.3.37", features = [ "formatting", "macros", "parsing", "serde", ] } -tokio = { version = "1.41.1", features = [ +tokio = { version = "1.42.0", features = [ "macros", "process", "rt-multi-thread", @@ -60,9 +60,9 @@ tokio-postgres = { version = "0.7.12", features = [ "with-serde_json-1", "with-time-0_3", ] } -tokio-util = { version = "0.7.12", features = ["rt"] } +tokio-util = { version = "0.7.13", features = ["rt"] } tower = "0.5.1" tower-http = { version = "0.6.2", features = ["auth", "fs", "set-header", "trace"] } tracing = "0.1.41" -tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } +tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } uuid = { version = "1.11.0", features = ["serde", "v4"] } diff --git a/clowarden-server/Dockerfile b/clowarden-server/Dockerfile index f166e20..92a35ba 100644 --- a/clowarden-server/Dockerfile +++ b/clowarden-server/Dockerfile @@ -1,5 +1,5 @@ # Build clowarden -FROM rust:1-alpine3.20 AS builder +FROM rust:1-alpine3.21 AS builder RUN apk --no-cache add musl-dev perl make WORKDIR /clowarden COPY Cargo.* ./ @@ -10,7 +10,7 @@ WORKDIR /clowarden/clowarden-server RUN cargo build --release # Build frontend -FROM node:18-alpine3.20 AS frontend-builder +FROM node:18-alpine3.21 AS frontend-builder RUN apk --no-cache add git WORKDIR /web COPY web . @@ -20,7 +20,7 @@ RUN yarn install --network-concurrency 1 RUN yarn build # Final stage -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk --no-cache add ca-certificates && addgroup -S clowarden && adduser -S clowarden -G clowarden USER clowarden WORKDIR /home/clowarden diff --git a/database/migrations/Dockerfile b/database/migrations/Dockerfile index 8544787..75deeb6 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -1,10 +1,10 @@ # Build tern -FROM golang:1.23.3-alpine3.20 AS tern +FROM golang:1.23.4-alpine3.21 AS tern RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN addgroup -S clowarden && adduser -S clowarden -G clowarden USER clowarden WORKDIR /home/clowarden