diff --git a/Cargo.lock b/Cargo.lock index 1bd3407..f6365ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,9 +122,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-lc-rs" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474d7cec9d0a1126fad1b224b767fcbf351c23b0309bb21ec210bcfd379926a5" +checksum = "bf7d844e282b4b56750b2d4e893b2205581ded8709fddd2b6aa5418c150ca877" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7505fc3cb7acbf42699a43a79dd9caa4ed9e99861dfbb837c5c0fb5a0a8d2980" +checksum = "c3a2c29203f6bf296d01141cc8bb9dbd5ecd4c27843f2ee0767bcd5985a927da" dependencies = [ "bindgen", "cc", @@ -1668,9 +1668,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.9" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "aws-lc-rs", "log", @@ -2005,7 +2005,6 @@ dependencies = [ "axum-server", "clap", "config", - "dotenvy", "dotenvy_macro", "env_logger", "home", @@ -2160,7 +2159,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.9", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index d8feb83..0028097 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ axum = "0.7.5" axum-server = { version = "0.6.0", features = ["tls-rustls", "tls-openssl"] } clap = { version = "4.5.4", features = ["derive"] } config = "0.14.0" -dotenvy = "0.15.7" dotenvy_macro = "0.15.7" env_logger = "0.11.3" home = "0.5.9" diff --git a/Dockerfile b/Dockerfile index 013a4ed..c5e513c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN /bin/bash -c 'if [ -z "$CARGO_SERVER_SSL_CA" ]; then echo "Error: CARGO_SERV if [ -z "$CARGO_SERVER_SSL_KEY" ]; then echo "Error: CARGO_SERVER_SSL_KEY is not set"; exit 1; fi' RUN apt update -RUN apt install -y protobuf-compiler libssl-dev gcc pkg-config build-essential +RUN apt install -y protobuf-compiler libssl-dev gcc pkg-config build-essential cmake RUN mkdir -p ${TAGOIO_SOURCE_FOLDER} WORKDIR ${TAGOIO_SOURCE_FOLDER} @@ -26,11 +26,14 @@ RUN touch .env RUN cargo build --release +# Unset the SSL environment variables +RUN unset CARGO_SERVER_SSL_CA CARGO_SERVER_SSL_CERT CARGO_SERVER_SSL_KEY + FROM debian:bookworm-slim ARG TAGOIO_SOURCE_FOLDER="/tago-io" RUN apt update -RUN apt install -y build-essential netcat-traditional ca-certificates +RUN apt install -y openssl build-essential netcat-traditional ca-certificates RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN mkdir -p ${TAGOIO_SOURCE_FOLDER}