Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from vnepogodin/main

Browse Source 
fix backend build
This commit is contained in:
AppFlowy.IO 2021-11-22 09:01:46 +08:00 committed by GitHub
commit 0bbf9c3ef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/Dockerfile
View File

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

2
backend/src/entities/token.rs
View File

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

2
backend/src/service/user/logged_user.rs
View File

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