smaller docker image + back to axum

.dockerignore

@@ -0,0 +1,4 @@
+target
+Dockerfile
+README.md
+Tiltfile

Cargo.toml

@@ -10,10 +10,8 @@ description = "A bridge between the World ID SDK and the World App"
 [dependencies]
 axum = "0.6.20"
 tower = "0.4.13"
-serde = "1.0.183"
+serde = { version = "1.0.183", features = ["derive"] }
 dotenvy = "0.15.7"
-lambda_http = "0.8.1"
-axum-aws-lambda = "0.5.0"
 tracing = { version = "0.1", features = ["log"] }
 tokio = { version = "1.31.0", features = ["full"] }
 tower-http = { version = "0.4.3", features = ["cors"] }

Dockerfile

@@ -1,24 +1,20 @@
 ####################################################################################################
 ## Base image
 ####################################################################################################
-FROM rust:latest AS builder
-
-RUN update-ca-certificates
-
+FROM clux/muslrust:stable AS chef
+USER root
 WORKDIR /app
+RUN cargo install cargo-chef
 
-COPY ./Cargo.toml .
-COPY ./Cargo.lock .
-
-RUN mkdir ./src && echo 'fn main() { println!("you lost the game"); }' > ./src/main.rs
-
-RUN cargo build --release
-
-RUN rm -rf ./src
-
-COPY src src
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
 
-RUN cargo build --release
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+RUN cargo chef cook --release --target x86_64-unknown-linux-musl --recipe-path recipe.json
+COPY . .
+RUN cargo build --release --target x86_64-unknown-linux-musl
 
 ####################################################################################################
 ## Final image
@@ -27,6 +23,8 @@ FROM gcr.io/distroless/cc
 
 WORKDIR /app
 
-COPY --from=builder /app/target/release/world-id-bridge /app/world-id-bridge
+COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/world-id-bridge /app/world-id-bridge
 
+USER 100
+EXPOSE 8000
 CMD ["/app/world-id-bridge"]

src/server.rs

@@ -1,16 +1,21 @@
-use axum::Extension;
-use axum_aws_lambda::LambdaLayer;
+use std::{env, net::SocketAddr};
+
+use axum::{Extension, Server};
 use redis::aio::ConnectionManager;
-use tower::ServiceBuilder;
 
 use crate::routes;
 
 pub async fn start(redis: ConnectionManager) {
-    let router = routes::handler().layer(Extension(redis));
+    let app = routes::handler().layer(Extension(redis));
 
-    let app = ServiceBuilder::new()
-        .layer(LambdaLayer::default())
-        .service(router);
+    let address = SocketAddr::from((
+        [0, 0, 0, 0],
+        env::var("PORT").map_or(8000, |p| p.parse().unwrap()),
+    ));
 
-    lambda_http::run(app).await.unwrap();
+    println!("🪩 World Bridge started on http://{address}");
+    Server::bind(&address)
+        .serve(app.into_make_service())
+        .await
+        .expect("Failed to start server");
 }