diff --git a/Cargo.lock b/Cargo.lock index f3ae25a..d261a9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "8c6f84b74db2535ebae81eede2f39b947dcbf01d093ae5f791e5dd414a1bf289" [[package]] name = "ascii" @@ -110,9 +110,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -287,9 +287,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -298,9 +298,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", @@ -1332,9 +1332,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -1364,18 +1364,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "111.27.0+1.1.1v" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -1519,9 +1519,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1688,13 +1688,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.6", "regex-syntax 0.7.4", ] @@ -1709,9 +1709,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -1880,18 +1880,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.181" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.181" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", @@ -1900,9 +1900,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2184,11 +2184,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -2197,7 +2196,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] diff --git a/Cargo.toml b/Cargo.toml index 5ca010d..2868bfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,11 @@ edition = "2021" rust-version = "1.65" [workspace.dependencies] -anyhow = "1.0.72" -async-trait = "0.1.72" +anyhow = "1.0.74" +async-trait = "0.1.73" axum = { version = "0.6.20", features = ["macros"] } bincode = "1.3.3" -clap = { version = "4.3.19", features = ["derive"] } +clap = { version = "4.3.21", features = ["derive"] } config = "0.13.3" deadpool = "0.9.5" deadpool-postgres = { version = "0.10.5", features = ["serde"] } @@ -29,13 +29,13 @@ lazy_static = "1.4.0" mime = "0.3.17" mockall = "0.11.4" mockito = "1.1.0" -openssl = { version = "0.10.55", features = ["vendored"] } +openssl = { version = "0.10.56", features = ["vendored"] } postgres-openssl = "0.5.0" postgres-types = { version = "0.2.5", features = ["derive"] } -regex = "1.9.1" +regex = "1.9.3" reqwest = { version = "0.11.18", features = ["json"] } -serde = { version = "1.0.181", features = ["derive"] } -serde_json = "1.0.104" +serde = { version = "1.0.183", features = ["derive"] } +serde_json = "1.0.105" serde_qs = "0.12.0" serde_yaml = "0.9.25" sha2 = "0.10.7" @@ -45,7 +45,7 @@ time = { version = "0.3.23", features = [ "parsing", "serde", ] } -tokio = { version = "1.29.1", features = [ +tokio = { version = "1.31.0", features = [ "macros", "process", "rt-multi-thread", diff --git a/clotributor-apiserver/Dockerfile b/clotributor-apiserver/Dockerfile index 0c551eb..52d3835 100644 --- a/clotributor-apiserver/Dockerfile +++ b/clotributor-apiserver/Dockerfile @@ -20,7 +20,7 @@ RUN yarn install --network-concurrency 1 RUN yarn build # Final stage -FROM alpine:3.18.2 +FROM alpine:3.18.3 RUN apk --no-cache add ca-certificates && addgroup -S clotributor && adduser -S clotributor -G clotributor USER clotributor WORKDIR /home/clotributor diff --git a/clotributor-registrar/Dockerfile b/clotributor-registrar/Dockerfile index 7eb1de4..dba29e9 100644 --- a/clotributor-registrar/Dockerfile +++ b/clotributor-registrar/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /clotributor/clotributor-registrar RUN cargo build --release # Final stage -FROM alpine:3.18.2 +FROM alpine:3.18.3 RUN apk --no-cache add ca-certificates && addgroup -S clotributor && adduser -S clotributor -G clotributor USER clotributor WORKDIR /home/clotributor diff --git a/clotributor-tracker/Dockerfile b/clotributor-tracker/Dockerfile index fc71650..17b3553 100644 --- a/clotributor-tracker/Dockerfile +++ b/clotributor-tracker/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /clotributor/clotributor-tracker RUN cargo build --release # Final stage -FROM alpine:3.18.2 +FROM alpine:3.18.3 RUN apk --no-cache add ca-certificates && addgroup -S clotributor && adduser -S clotributor -G clotributor USER clotributor WORKDIR /home/clotributor diff --git a/database/migrations/Dockerfile b/database/migrations/Dockerfile index 0bd7a27..36227a0 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -1,10 +1,10 @@ # Build tern -FROM golang:1.20.7-alpine3.18 AS tern +FROM golang:1.21.0-alpine3.18 AS tern RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.18.2 +FROM alpine:3.18.3 RUN addgroup -S clotributor && adduser -S clotributor -G clotributor USER clotributor WORKDIR /home/clotributor