From e55ee37eec905e31ec00f04c9c0153a0fdb7f18b Mon Sep 17 00:00:00 2001 From: Ho Kim Date: Tue, 30 Jul 2024 16:28:39 +0000 Subject: [PATCH] chore: change default tls to rustls --- Dockerfile | 3 ++- Dockerfile.server | 4 ++-- crates/cassette-core/Cargo.toml | 2 +- crates/cassette-gateway/Cargo.toml | 4 ++-- crates/cassette-operator/Cargo.toml | 2 +- crates/cassette-plugin-cdl-api/Cargo.toml | 2 +- crates/cassette/Cargo.toml | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c9f32e..1c4efc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,7 +80,8 @@ RUN \ # Disable terminal hooks && sed -i '/\[\[hooks\]\]/,$d' 'Trunk.toml' \ # Build - && trunk build --dist '/out' --release --features 'full' + && trunk build --dist '/out' --release \ + --no-default-features --features 'full' # Copy executable files FROM server diff --git a/Dockerfile.server b/Dockerfile.server index 108c264..badc550 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -23,7 +23,6 @@ CMD [ "/bin/bash" ] # Install dependencies RUN apt-get update && apt-get install -y \ hwloc \ - libssl3 \ # Cleanup && apt-get clean all \ && rm -rf /var/lib/apt/lists/* @@ -56,7 +55,8 @@ RUN \ # Create an output directory mkdir /out \ # Build - && cargo build --release --features 'full' \ + && cargo build --release \ + --no-default-features --features 'full,openark,rustls-tls' \ --package 'cassette-gateway' \ --package 'cassette-operator' \ && find ./target/release/ -maxdepth 1 -type f -perm -a=x -print0 | xargs -0 -I {} mv {} /out diff --git a/crates/cassette-core/Cargo.toml b/crates/cassette-core/Cargo.toml index 70770a8..d41a5ee 100644 --- a/crates/cassette-core/Cargo.toml +++ b/crates/cassette-core/Cargo.toml @@ -31,7 +31,7 @@ stream = ["dep:wasm-streams"] examples = [] mock-release = [] -# plugins +# Plugins ## Connected Data Lake (CDL) cdl = [] diff --git a/crates/cassette-gateway/Cargo.toml b/crates/cassette-gateway/Cargo.toml index bc7d271..0d8ae5c 100644 --- a/crates/cassette-gateway/Cargo.toml +++ b/crates/cassette-gateway/Cargo.toml @@ -26,7 +26,7 @@ experimental = [] openark = ["vine"] # TLS -default-tls = ["openssl-tls"] +default-tls = ["rustls-tls"] openssl-tls = [ "actix-web/openssl", "cassette-plugin-cdl-api/openssl-tls", @@ -46,7 +46,7 @@ vine = [ "cassette-plugin-kubernetes-api?/vine", ] -# plugins +# Plugins ## Connected Data Lake (CDL) cdl = ["cassette-core/cdl", "dep:cassette-plugin-cdl-api"] diff --git a/crates/cassette-operator/Cargo.toml b/crates/cassette-operator/Cargo.toml index 680b8c6..ed52c59 100644 --- a/crates/cassette-operator/Cargo.toml +++ b/crates/cassette-operator/Cargo.toml @@ -23,7 +23,7 @@ workspace = true default = ["default-tls"] # TLS -default-tls = ["openssl-tls"] +default-tls = ["rustls-tls"] openssl-tls = ["kube/openssl-tls"] rustls-tls = ["kube/rustls-tls"] diff --git a/crates/cassette-plugin-cdl-api/Cargo.toml b/crates/cassette-plugin-cdl-api/Cargo.toml index 5568792..1ae912a 100644 --- a/crates/cassette-plugin-cdl-api/Cargo.toml +++ b/crates/cassette-plugin-cdl-api/Cargo.toml @@ -24,7 +24,7 @@ default = [] vine = ["cassette-plugin-kubernetes-api/vine"] # TLS -default-tls = ["openssl-tls"] +default-tls = ["rustls-tls"] openssl-tls = ["dash-pipe-provider/openssl-tls", "kube/openssl-tls"] rustls-tls = ["dash-pipe-provider/rustls-tls", "kube/rustls-tls"] diff --git a/crates/cassette/Cargo.toml b/crates/cassette/Cargo.toml index a81bc32..125c2f0 100644 --- a/crates/cassette/Cargo.toml +++ b/crates/cassette/Cargo.toml @@ -29,7 +29,7 @@ experimental = [] examples = ["cassette-core/examples", "dep:cassette-loader-file"] mock-release = ["cassette-core/mock-release"] -# plugins +# Plugins ## Connected Data Lake (CDL) cdl = [