Skip to content

Commit

Permalink
Revert "Update Dockerfile (#81)" (#83)
Browse files Browse the repository at this point in the history
This reverts commit e37b627.
  • Loading branch information
tomt1664 authored Aug 2, 2024
1 parent 71c7c72 commit 1c87d91
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 33 deletions.
3 changes: 0 additions & 3 deletions Rocket2.toml

This file was deleted.

40 changes: 10 additions & 30 deletions token-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,34 +1,14 @@
# 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"]

0 comments on commit 1c87d91

Please sign in to comment.