From 9011ccde4298192cdc4c7574420abf4c8c2a0cf0 Mon Sep 17 00:00:00 2001 From: Devin Jean Date: Tue, 7 Jan 2025 17:43:42 -0600 Subject: [PATCH] fix openssl ver --- Cargo.lock | 12 ++++++------ crates/api-common/Cargo.toml | 2 +- crates/api/Cargo.toml | 4 ++-- crates/cli/Cargo.toml | 4 ++-- crates/cloud-common/Cargo.toml | 4 ++-- crates/cloud/Cargo.toml | 4 ++-- crates/migrate/Cargo.toml | 4 ++-- docker/Dockerfile.cloud | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9fa786..7fb346c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2574,7 +2574,7 @@ dependencies = [ [[package]] name = "netsblox-api" -version = "1.6.4" +version = "1.6.5" dependencies = [ "derive_more", "futures-util", @@ -2589,7 +2589,7 @@ dependencies = [ [[package]] name = "netsblox-api-common" -version = "1.6.4" +version = "1.6.5" dependencies = [ "bson", "derive_more", @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "netsblox-cli" -version = "1.6.4" +version = "1.6.5" dependencies = [ "clap", "confy", @@ -2621,7 +2621,7 @@ dependencies = [ [[package]] name = "netsblox-cloud" -version = "1.6.4" +version = "1.6.5" dependencies = [ "actix", "actix-cors", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "netsblox-cloud-common" -version = "1.6.4" +version = "1.6.5" dependencies = [ "hex", "mongodb", @@ -2675,7 +2675,7 @@ dependencies = [ [[package]] name = "netsblox-migrate" -version = "1.6.4" +version = "1.6.5" dependencies = [ "aws-config", "aws-credential-types", diff --git a/crates/api-common/Cargo.toml b/crates/api-common/Cargo.toml index aa79368..e27aa7e 100644 --- a/crates/api-common/Cargo.toml +++ b/crates/api-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netsblox-api-common" -version = "1.6.4" +version = "1.6.5" edition = "2021" license = "MIT" description = """ diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index aec778f..b836481 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netsblox-api" -version = "1.6.4" +version = "1.6.5" edition = "2021" license = "MIT" description = """ @@ -13,7 +13,7 @@ A client library for the NetsBlox cloud API serde = { version = "1.0.130", features = ["derive"] } reqwest = { version = "0.11.20", features = ["json", "cookies"]} futures-util = "0.3.19" -netsblox-api-common = { path = "../api-common", version = "1.6.4" } +netsblox-api-common = { path = "../api-common", version = "1.6.5" } tokio-tungstenite = { version = "0.20.0", features = ["native-tls"] } tungstenite = "0.20.1" tokio = "1.0.0" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index a3561ed..cc75716 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netsblox-cli" -version = "1.6.4" +version = "1.6.5" edition = "2021" license = "MIT" description = """ @@ -22,7 +22,7 @@ serde = { version = "1.0.130", features = ["derive"] } serde_json = "1.0.96" inquire = "0.6.2" reqwest = {version = "0.11.20", features = ["json", "cookies"]} -netsblox-api = { path = "../api", version = "1.6.4" } +netsblox-api = { path = "../api", version = "1.6.5" } futures-util = "0.3.19" exitcode = "1.1.2" xmlparser = "0.13.5" diff --git a/crates/cloud-common/Cargo.toml b/crates/cloud-common/Cargo.toml index 9930a04..a942f4b 100644 --- a/crates/cloud-common/Cargo.toml +++ b/crates/cloud-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netsblox-cloud-common" -version = "1.6.4" +version = "1.6.5" edition = "2021" license = "MIT" description = """ @@ -14,7 +14,7 @@ serde = "1.0.130" serde_json = "1.0.59" mongodb = "2.6.1" passwords = "3.1.8" -netsblox-api-common = { path = "../api-common", version = "1.6.4", features = ["to_bson"] } +netsblox-api-common = { path = "../api-common", version = "1.6.5", features = ["to_bson"] } uuid = { version = "1.0.0-alpha.1", features = ["v4", "fast-rng"] } sha2 = "0.10.0" hex = "0.4.3" diff --git a/crates/cloud/Cargo.toml b/crates/cloud/Cargo.toml index 1988bb8..a3b86d0 100644 --- a/crates/cloud/Cargo.toml +++ b/crates/cloud/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "netsblox-cloud" -version = "1.6.4" +version = "1.6.5" edition = "2021" license = "MIT" description = """ @@ -31,7 +31,7 @@ figment = { version = "0.10.19", features = ["toml"]} itertools = "0.10.3" uuid = { version = "1.6.1", features = ["v4", "fast-rng", "serde"] } derive_more = "0.99.17" -netsblox-cloud-common = { path = "../cloud-common", version = "1.6.4" } +netsblox-cloud-common = { path = "../cloud-common", version = "1.6.5" } reqwest = {version = "0.11.20", features = ["cookies", "json"]} lru = "0.11.1" lettre = {version = "0.11.2", features = ["smtp-transport", "builder"]} diff --git a/crates/migrate/Cargo.toml b/crates/migrate/Cargo.toml index b920886..2997511 100644 --- a/crates/migrate/Cargo.toml +++ b/crates/migrate/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "netsblox-migrate" -version = "1.6.4" +version = "1.6.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -netsblox-cloud-common = { path = "../cloud-common", version = "1.6.4" } +netsblox-cloud-common = { path = "../cloud-common", version = "1.6.5" } mongodb = "2.6.1" serde = "1.0.130" serde_json = "1.0.59" diff --git a/docker/Dockerfile.cloud b/docker/Dockerfile.cloud index 94e81e1..e3db8d1 100644 --- a/docker/Dockerfile.cloud +++ b/docker/Dockerfile.cloud @@ -4,7 +4,7 @@ COPY . . RUN cargo install --path crates/cloud --locked FROM debian:bullseye-slim -RUN apt-get update && apt-get install -y libssl1.1 ca-certificates && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y libssl1.1 libssl3 ca-certificates && rm -rf /var/lib/apt/lists/* COPY --from=builder /usr/local/cargo/bin/netsblox-cloud /usr/local/bin/netsblox-cloud COPY ./crates/cloud/config/ /config/ CMD ["netsblox-cloud"]