Skip to content

Commit

Permalink
Merge pull request #66 from vnepogodin/main
Browse files Browse the repository at this point in the history
fix backend build
  • Loading branch information
appflowy authored Nov 22, 2021
2 parents 06cabc7 + f9ff3b1 commit 3ea6177
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion backend/src/entities/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>>;

Expand Down
2 changes: 1 addition & 1 deletion backend/src/service/user/logged_user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>>;

Expand Down

0 comments on commit 3ea6177

Please sign in to comment.