From e2c83c817bb944bc0aa06b0c24851995fb3e64ee Mon Sep 17 00:00:00 2001
From: Nick Bland <nisky38@hotmail.com>
Date: Tue, 16 Nov 2021 15:50:00 +1000
Subject: [PATCH] CHEFerise docker app to make it more efficient

---
 Dockerfile  | 15 ++++++++++++---
 src/main.rs |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a20a22f..023f53f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,17 @@
-FROM rust:1.56-slim AS builder
-
+FROM lukemathwalker/cargo-chef:latest-rust-1.53.0 AS chef
 WORKDIR /app
-COPY . .
 
+# Create lock file for project to be used in builder
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+# Build dependancies
+FROM chef as builder
+COPY --from=planner /app/recipe.json recipe.json
+RUN cargo chef cook --release --recipe-path recipe.json
+
+COPY . .
 ENV SQLX_OFFLINE true
 RUN cargo build --release
 
diff --git a/src/main.rs b/src/main.rs
index bd71fe4..f672be1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ async fn main() -> std::io::Result<()> {
     let configuration = get_configuration().expect("Failed to read configuration data.");
 
     // Configure connection to database for our startup
-    let connection_pool = PgPool::new()
+    let connection_pool = PgPoolOptions::new()
         .connect_timeout(std::time::Duration::from_secs(2))
         .connect(&configuration.database.connection_string())
         .expect("Failed to connect to Postgres.");