From 949ec95c2799f76fb31721f1a4bfac4a7034693a Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 10 Jul 2026 17:53:48 -0400 Subject: [PATCH] bump: rust docker --- Dockerfile | 19 +------------------ docker-compose.yaml | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9659b78..9cd5194 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -# Stage 1: Build the application -FROM rust:1.96.1 as builder +FROM rust:1.97 as builder # Set the working directory inside the container WORKDIR /usr/src/app @@ -11,35 +10,23 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ openssh-client git \ && rm -rf /var/lib/apt/lists/* -# << --- ADD HOST KEY HERE --- >> -# Replace 'yourgithost.com' with the actual hostname (e.g., github.com) RUN mkdir -p -m 0700 ~/.ssh && \ ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts -# Copy Cargo manifests COPY Cargo.toml Cargo.lock ./ -# Build *only* dependencies to leverage Docker cache -# This dummy build caches dependencies as a separate layer RUN --mount=type=ssh mkdir src && \ echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ cargo build --release --quiet && \ rm -rf src target/release/deps/catapult* -# Copy the actual source code COPY src ./src # If you have other directories like `templates` or `static`, copy them too COPY .env ./.env -# << --- SSH MOUNT ADDED HERE --- >> -# Build *only* dependencies to leverage Docker cache -# This dummy build caches dependencies as a separate layer -# Mount the SSH agent socket for this command RUN --mount=type=ssh \ cargo build --release --quiet -# Stage 2: Create the final, smaller runtime image -# Use a minimal base image like debian-slim or even distroless for security/size FROM debian:trixie-slim # Install runtime dependencies if needed (e.g., SSL certificates) @@ -48,12 +35,8 @@ RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && r # Set the working directory WORKDIR /usr/local/bin -# Copy the compiled binary from the builder stage -# Replace 'catapult' with the actual name of your binary (usually the crate name) COPY --from=builder /usr/src/app/target/release/catapult . -# Copy other necessary files like .env (if used for runtime config) or static assets -# It's generally better to configure via environment variables in Docker though COPY --from=builder /usr/src/app/.env . # Set the command to run your application diff --git a/docker-compose.yaml b/docker-compose.yaml index 68c84f6..a6e9b98 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,8 +4,8 @@ services: songparser: build: context: . - ssh: ["default"] # Uses host's SSH agent + ssh: ["default"] container_name: catapult env_file: - .env - restart: unless-stopped # Optional: Restart policy + restart: unless-stopped