From 7621f56b3443b774a421cd96647b3a421c33d2fa Mon Sep 17 00:00:00 2001 From: hole-thu Date: Sat, 30 Dec 2023 23:11:57 +0800 Subject: [PATCH] fix lock rc version --- .dockerignore | 1 - Cargo.toml | 3 +++ Dockerfile | 1 + rust-toolchain | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index c2bf7ee..adb5fb7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ /target Cargo.lock -rust-toolchain /user_files *.db .env diff --git a/Cargo.toml b/Cargo.toml index 38d322b..5e10165 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,10 @@ mastlogin = ["reqwest"] [dependencies] rocket = { version = "=0.5.0-rc.2", features = ["json"] } +rocket_codegen = "=0.5.0-rc.2" +rocket_http = "=0.5.0-rc.2" rocket_sync_db_pools = { version = "=0.1.0-rc.2", features = ["diesel_postgres_pool"] } +rocket_sync_db_pools_codegen = "=0.1.0-rc.2" diesel = { version = "1.4.8", features = ["postgres", "chrono"] } diesel_migrations = "1.4.0" redis = { version="0.23.0", features = ["aio", "tokio-comp"] } diff --git a/Dockerfile b/Dockerfile index feed0db..d53a570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ WORKDIR /usr/src/ RUN cargo new myapp --vcs none WORKDIR /usr/src/myapp COPY Cargo.toml ./ +COPY rust-toolchain ./ RUN cargo build --release # 为了充分利用docker的缓存 diff --git a/rust-toolchain b/rust-toolchain index 8725364..2bf5ad0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.64 +stable