Fix:A bunch of tiny improvements here and there

Author: iPeluwa

Dockerfile

@@ -6,24 +6,24 @@
 FROM rustlang/rust:nightly-bullseye-slim AS builder
 WORKDIR /app
 
-# Install build dependencies.
+# Install build dependencies
 RUN apt-get update && \
     apt-get install -y pkg-config libssl-dev && \
     rm -rf /var/lib/apt/lists/*
 
-# Copy Cargo manifests and cache dependencies.
+# Copy Cargo manifests and cache dependencies
 COPY Cargo.toml Cargo.lock ./
 
-# Create a dummy main file to allow dependency caching.
+# Create a dummy main file to allow dependency caching
 RUN mkdir src && echo "fn main() {}" > src/main.rs
 
-# Build a dummy release binary (to cache dependencies).
+# Build a dummy release binary (to cache dependencies)
 RUN cargo build --release
 
-# Now copy the full source code.
-COPY . .
+# Copy the full source code, including dashboard.html
+COPY src/ src/
 
-# Build the real release binary.
+# Build the real release binary
 RUN cargo build --release
 
 ##############################
@@ -32,30 +32,30 @@ RUN cargo build --release
 FROM ubuntu:20.04
 WORKDIR /app
 
-# Install runtime dependencies.
+# Install runtime dependencies
 RUN apt-get update && \
     apt-get install -y ca-certificates libssl1.1 && \
     rm -rf /var/lib/apt/lists/*
 
-# Create a non-root user.
+# Create a non-root user
 RUN groupadd -r appgroup && useradd -r -g appgroup appuser
 
-# Create and set permissions for directories.
+# Create and set permissions for directories
 RUN mkdir -p /app/queue_db /app/data && \
     chown -R appuser:appgroup /app /app/queue_db /app/data && \
     chmod -R 775 /app /app/queue_db /app/data
 
-# Copy the compiled binary from the builder stage.
+# Copy the compiled binary from the builder stage
 COPY --from=builder /app/target/release/timefusion /usr/local/bin/timefusion
 
-# Adjust ownership of the binary.
+# Adjust ownership of the binary
 RUN chown appuser:appgroup /usr/local/bin/timefusion
 
-# Expose the required ports.
-EXPOSE 8080 5432
+# Expose the required ports
+EXPOSE 80 5432
 
-# Switch to the non-root user.
+# Switch to the non-root user
 USER appuser
 
-# Start the application.
+# Start the application
 ENTRYPOINT ["/usr/local/bin/timefusion"]

src/main.rs

@@ -27,7 +27,6 @@ use anyhow::Context;
 use metrics::{UPTIME_GAUGE, COMPACTION_COUNTER, HTTP_REQUEST_COUNTER, INGESTION_COUNTER, ERROR_COUNTER};
 use prometheus::core::Collector;
 use std::collections::HashMap;
-use std::fs;
 
 #[get("/dashboard")]
 async fn dashboard(
@@ -135,7 +134,7 @@ async fn dashboard(
         }
     };
 
-    let html = fs::read_to_string("./src/dashboard/dashboard.html").expect("Failed to read dashboard.html")
+    let html = include_str!("dashboard/dashboard.html")
         .replace("{{uptime}}", &uptime.to_string())
         .replace("{{compactions}}", &compactions.to_string())
         .replace("{{http_requests}}", &http_requests.to_string())