diff --git a/Rocket2.toml b/Rocket2.toml deleted file mode 100644 index 732f51f6..00000000 --- a/Rocket2.toml +++ /dev/null @@ -1,3 +0,0 @@ -[global] -address = "0.0.0.0" -port = 8001 diff --git a/token-server/Dockerfile b/token-server/Dockerfile index c3b9e549..7dc012c2 100644 --- a/token-server/Dockerfile +++ b/token-server/Dockerfile @@ -1,35 +1,15 @@ -# Use a base image that has the required GLIBC version -FROM debian:bullseye-slim as builder +FROM rust:1.77.0 -# 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 +# Set working directory +WORKDIR /app/lib +COPY ../lib . -# Set the environment path for Rust -ENV PATH="/root/.cargo/bin:${PATH}" +# Copy the project code +WORKDIR /app +COPY . . -# 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 ./Rocket2.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 - -# # Command to run the server by default when the container starts +RUN cargo build --release +EXPOSE 8001 +# Run the application CMD ["cargo", "run", "--bin", "token-server"]