From 7fa1b95cd4d6e3f3f31c60d5cabdf7c97f1513f3 Mon Sep 17 00:00:00 2001
From: Dhananjay Purohit <dhananjaypurohit7@gmail.com>
Date: Mon, 12 Aug 2024 17:00:52 +0530
Subject: [PATCH] Fix/dockerfile token server (#85)

* fix: token server dockerfile

* fix: build release for token server

* fix: upgrade sqlx version
---
 token-server/Cargo.toml |  2 +-
 token-server/Dockerfile | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/token-server/Cargo.toml b/token-server/Cargo.toml
index d43f7f28..829e905f 100644
--- a/token-server/Cargo.toml
+++ b/token-server/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 config = "0.13.1"
 reqwest = { version = "0.11.16", features = ["blocking", "json", "socks"] }
 rocket = { version = "0.5.0-rc", features = ["json"] }
-sqlx = { version = "0.7", features = [ "runtime-tokio", "postgres", "time", "uuid", "tls-rustls" ] }
+sqlx = { version = "0.8.0", features = [ "runtime-tokio", "postgres", "time", "uuid", "tls-rustls" ] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 schemars = { version = "0.8.12", features = ["chrono", "uuid"] }
diff --git a/token-server/Dockerfile b/token-server/Dockerfile
index e62903cd..dcb7831e 100644
--- a/token-server/Dockerfile
+++ b/token-server/Dockerfile
@@ -1,14 +1,35 @@
-FROM rust:1.77.0
+# Use a base image that has the required GLIBC version
+FROM debian:bullseye-slim as builder
 
-# Set working directory
-WORKDIR /app/lib
-COPY ../lib .
+# Install Rust, protobuf compiler, and library dependencies
+RUN apt-get update && apt-get install -y curl build-essential protobuf-compiler libprotobuf-dev pkg-config libssl-dev
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
-# Copy the project code
-WORKDIR /app
-COPY . .
+# Set the environment path for Rust
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+# Create a working directory
+WORKDIR /mercurylayer
+
+RUN echo "[workspace]\nmembers = [\"token-server\", \"lib\"]" > ./Cargo.toml
+COPY ./Cargo.lock ./Cargo.lock
+
+# Copy the server source code
+COPY ./token-server ./token-server
+COPY ./lib ./lib
+COPY ./Rocket.toml ./token-server/Rocket.toml
+
+# Make sure to copy Cargo.lock
+COPY ./token-server/Cargo.lock ./token-server/Cargo.lock
+
+WORKDIR /mercurylayer/token-server
+
+# RUN cargo build --verbose
+
+# # Build your Rust project. Since the source files are now present,
+# # the Rust compiler should be able to find and compile them.
+RUN CARGO_TARGET_DIR=target cargo build --release
 
-RUN cargo build --release
 EXPOSE 8001
-# Run the application
+# # Command to run the token server by default when the container starts
 CMD ["cargo", "run", "--bin", "token-server"]