Merge pull request #18 from Walther/2023-08-31-chores

2023 08 31 chores
Walther · Aug 31, 2023 · 811a9c3 · 811a9c3
2 parents 9e7251c + 6af9fb8
commit 811a9c3
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 24 deletions.
diff --git a/clovers-back/Cargo.toml b/clovers-back/Cargo.toml
@@ -6,16 +6,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.71"
-axum = { version = "0.6.18", features = ["macros", "ws"] }
+anyhow = "1.0.75"
+axum = { version = "0.6.20", features = ["macros", "ws"] }
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
 futures = "0.3.28"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.97"
+serde_json = "1.0.105"
 sqlx = { version = "0.6", features = [ "postgres", "runtime-tokio-rustls", "json" ] }
-tokio = { version = "1.28", features = ["full"] }
-tower-http = { version = "0.4.0", features = ["trace", "cors"] }
+tokio = { version = "1.32", features = ["full"] }
+tower-http = { version = "0.4.3", features = ["trace", "cors"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
diff --git a/clovers-back/Dockerfile b/clovers-back/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.70 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.72 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-back/dev.Dockerfile b/clovers-back/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.70 as rust-hotreload
+FROM rust:1.72 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-batch/Cargo.toml b/clovers-batch/Cargo.toml
@@ -6,14 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.75"
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
-image = "0.24.6"
+image = "0.24.7"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.97"
+serde_json = "1.0.105"
 sqlx = { version = "0.6", features = [ "postgres", "runtime-tokio-rustls", "json" ] }
-tokio = { version = "1.28", features = ["full"] }
+tokio = { version = "1.32", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
diff --git a/clovers-batch/Dockerfile b/clovers-batch/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.70 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.72 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-batch/dev.Dockerfile b/clovers-batch/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.70 as rust-hotreload
+FROM rust:1.72 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-preview/Cargo.toml b/clovers-preview/Cargo.toml
@@ -6,14 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.71"
+anyhow = "1.0.75"
 clovers-svc-common = { path = "../clovers-svc-common" }
 dotenv = "0.15.0"
-image = "0.24.6"
+image = "0.24.7"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.97"
+serde_json = "1.0.105"
 sqlx = { version = "0.6", features = [ "postgres", "runtime-tokio-rustls", "json" ] }
-tokio = { version = "1.28", features = ["full"] }
+tokio = { version = "1.32", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time"] }
diff --git a/clovers-preview/Dockerfile b/clovers-preview/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://github.com/LukeMathWalker/cargo-chef
 
-FROM lukemathwalker/cargo-chef:latest-rust-1.70 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.72 AS chef
 WORKDIR /app
 
 FROM chef AS planner

diff --git a/clovers-preview/dev.Dockerfile b/clovers-preview/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.70 as rust-hotreload
+FROM rust:1.72 as rust-hotreload
 WORKDIR /app
 
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash

diff --git a/clovers-svc-common/Cargo.toml b/clovers-svc-common/Cargo.toml
@@ -6,14 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.71"
-clovers = { git = "https://github.com/Walther/clovers/", rev = "305d52388fe2067bf93f7fdc4a804cf00e8eb3bc", default-features = false, features = ["serde-derive", "stl"] }
+anyhow = "1.0.75"
+clovers = { git = "https://github.com/Walther/clovers/", rev = "48ca4b0821a2e13b57f428577a4f35106be8c001", default-features = false, features = [
+  "serde-derive",
+  "stl",
+] }
 dotenv = "0.15.0"
 rand = { version = "0.8.5", features = ["small_rng"], default-features = false }
 rayon = "1.7.0"
 redis = { version = "0.22.3", features = ["tokio-comp", "connection-manager"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.97"
-sqlx = { version = "0.6", features = [ "postgres", "uuid", "runtime-tokio-rustls", "json" ] }
+serde_json = "1.0.105"
+sqlx = { version = "0.6", features = [
+  "postgres",
+  "uuid",
+  "runtime-tokio-rustls",
+  "json",
+] }
 tracing = "0.1"
-uuid = { version = "1.3.4", features = [ "v4", "serde" ]}
+uuid = { version = "1.4.1", features = ["v4", "serde"] }