From 112a0e7f697d494bf99311d9a09d0027450169df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Tue, 25 Jun 2024 11:00:11 +0200 Subject: [PATCH] Upgrade backend dependencies and base images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- Cargo.lock | 65 +++++++++++++++++----------------- Cargo.toml | 22 ++++++------ clowarden-server/Dockerfile | 6 ++-- database/migrations/Dockerfile | 4 +-- 4 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a05b3f9..cba7697 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "as-any" @@ -338,9 +338,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cached" -version = "0.51.3" +version = "0.51.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd93a9f06ec296ca66b4c26fafa9ed63f32c473d7a708a5f28563ee64c948515" +checksum = "0feb64151eed3da6107fddd2d717a6ca4b9dbd74e43784c55c841d1abfe5a295" dependencies = [ "ahash 0.8.11", "async-trait", @@ -402,9 +402,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -412,9 +412,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -424,9 +424,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -691,10 +691,11 @@ dependencies = [ [[package]] name = "deadpool-postgres" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19be9da496d60d03ec3ab45d960d80a3afb285b787394b83614a79942f467e7f" +checksum = "1ab8a4ea925ce79678034870834602a2980f4b88c09e97feb266496dbb4493d2" dependencies = [ + "async-trait", "deadpool", "getrandom", "serde", @@ -1284,9 +1285,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -1941,9 +1942,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2225,18 +2226,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -2256,9 +2257,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa", "ryu", @@ -2487,18 +2488,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -2563,9 +2564,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2582,9 +2583,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -2903,9 +2904,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", "serde", diff --git a/Cargo.toml b/Cargo.toml index 1683548..9d6ab30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,41 +13,41 @@ edition = "2021" rust-version = "1.70" [workspace.dependencies] -anyhow = "1.0.83" +anyhow = "1.0.86" as-any = "0.3.1" askama = "0.12.1" async-trait = "0.1.80" axum = { version = "0.7.5", features = ["macros"] } base64 = "0.22.1" -cached = { version = "0.51.3", features = ["async"] } -clap = { version = "4.5.4", features = ["derive"] } +cached = { version = "0.51.4", features = ["async"] } +clap = { version = "4.5.7", features = ["derive"] } clowarden-core = { path = "../clowarden-core" } config = "0.13.4" -deadpool-postgres = { version = "0.13.2", features = ["serde"] } +deadpool-postgres = { version = "0.14.0", features = ["serde"] } futures = "0.3.30" hmac = "0.12.1" hex = "0.4.3" -lazy_static = "1.4.0" +lazy_static = "1.5.0" mime = "0.3.17" mockall = "0.12.1" octorust = { git = "https://github.com/tegioz/third-party-api-clients.git" } openssl = { version = "0.10.64", features = ["vendored"] } pem = "3.0.4" postgres-openssl = "0.5.0" -regex = "1.10.4" -serde = { version = "1.0.201", features = ["derive"] } -serde_json = "1.0.117" +regex = "1.10.5" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.118" serde_qs = "0.13.0" serde_yaml = "0.9.34" sha2 = "0.10.8" -thiserror = "1.0.57" +thiserror = "1.0.61" time = { version = "0.3.36", features = [ "formatting", "macros", "parsing", "serde", ] } -tokio = { version = "1.37.0", features = [ +tokio = { version = "1.38.0", features = [ "macros", "process", "rt-multi-thread", @@ -64,4 +64,4 @@ tower = "0.4.13" tower-http = { version = "0.5.2", features = ["auth", "fs", "set-header", "trace"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } -uuid = { version = "1.8.0", features = ["serde", "v4"] } +uuid = { version = "1.9.1", features = ["serde", "v4"] } diff --git a/clowarden-server/Dockerfile b/clowarden-server/Dockerfile index 0604892..1582876 100644 --- a/clowarden-server/Dockerfile +++ b/clowarden-server/Dockerfile @@ -1,5 +1,5 @@ # Build clowarden -FROM rust:1-alpine3.19 as builder +FROM rust:1-alpine3.20 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.19 AS frontend-builder +FROM node:18-alpine3.20 AS frontend-builder RUN apk --no-cache add git WORKDIR /web COPY web . @@ -19,7 +19,7 @@ RUN yarn install --network-concurrency 1 RUN yarn build # Final stage -FROM alpine:3.19.1 +FROM alpine:3.20.1 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 b7e71ed..4f3a1ce 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -1,10 +1,10 @@ # Build tern -FROM golang:1.22.3-alpine3.19 AS tern +FROM golang:1.22.4-alpine3.19 AS tern RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.19.1 +FROM alpine:3.20.1 RUN addgroup -S clowarden && adduser -S clowarden -G clowarden USER clowarden WORKDIR /home/clowarden