Sfoglia il codice sorgente

Merge pull request #66 from vnepogodin/main

fix backend build
AppFlowy.IO 3 anni fa
parent
commit
0bbf9c3ef1

+ 2 - 3
backend/Dockerfile

@@ -1,5 +1,4 @@
-
-FROM rust:1.53.0
+FROM rust:1.56.1
 # Let's switch our working directory to `app` (equivalent to `cd app`)
 # The `app` folder will be created for us by Docker in case it does not
 # exist already.
@@ -10,7 +9,7 @@ COPY . .
 WORKDIR /app/backend
 ENV SQLX_OFFLINE true
 ENV APP_ENVIRONMENT production
-RUN cargo build --release
+RUN RUSTFLAGS="-C opt-level=2" cargo build --release
 
 # When `docker run` is executed, launch the binary!
 ENTRYPOINT ["./target/release/backend"]

+ 1 - 1
backend/src/entities/token.rs

@@ -80,7 +80,7 @@ use backend_service::config::HEADER_TOKEN;
 use futures::future::{ready, Ready};
 
 impl FromRequest for Token {
-    type Config = ();
+    //type Config = ();
     type Error = ServerError;
     type Future = Ready<Result<Self, Self::Error>>;
 

+ 1 - 1
backend/src/service/user/logged_user.rs

@@ -41,7 +41,7 @@ use actix_web::{dev::Payload, FromRequest, HttpRequest};
 use futures::future::{ready, Ready};
 
 impl FromRequest for LoggedUser {
-    type Config = ();
+    //type Config = ();
     type Error = ServerError;
     type Future = Ready<Result<Self, Self::Error>>;