From bd01dac544b41901e6a2e9425ce79bbc1b2a9a4f Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 16 Aug 2025 23:12:05 +0000 Subject: [PATCH] tsk-42: Dockerize the service (#44) Closes #42 Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/44 Co-authored-by: phoenix Co-committed-by: phoenix --- .dockerignore.yaml | 18 +++++++++++++ .env.docker.sample | 6 ++--- Cargo.lock | 2 +- Cargo.toml | 2 +- Dockerfile | 63 +++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yaml | 12 +++++++++ src/main.rs | 5 ++-- 7 files changed, 101 insertions(+), 7 deletions(-) create mode 100644 .dockerignore.yaml create mode 100644 Dockerfile create mode 100644 docker-compose.yaml diff --git a/.dockerignore.yaml b/.dockerignore.yaml new file mode 100644 index 0000000..f63305b --- /dev/null +++ b/.dockerignore.yaml @@ -0,0 +1,18 @@ +# Ignore build artifacts +target/ +pkg/ + +# Ignore git directory +.git/ + +.gitea/ + +# Ignore environment files (configure via docker-compose instead) +.env* + +# Ignore IDE/editor specific files +.idea/ +.vscode/ + +# Ignore OS specific files +*.DS_Store diff --git a/.env.docker.sample b/.env.docker.sample index f116df7..5c5422d 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -1,4 +1,4 @@ -ROOT_DIRECTORY=/home/songparser/mydata -ICARUS_BASE_API_URL=http://localhost:3000 -ICARUS_AUTH_BASE_API_URL=http://localhost:3001 +ROOT_DIRECTORY=/usr/local/bin +ICARUS_BASE_API_URL=http://api:3000 +ICARUS_AUTH_BASE_API_URL=http://auth_api:3000 SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH diff --git a/Cargo.lock b/Cargo.lock index af8391a..b6686d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "songparser" -version = "0.2.5" +version = "0.2.6" dependencies = [ "futures", "icarus_envy", diff --git a/Cargo.toml b/Cargo.toml index 3d91bd0..ae492f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "songparser" -version = "0.2.5" +version = "0.2.6" edition = "2024" rust-version = "1.88" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cab7a8c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,63 @@ +# Stage 1: Build the application +# Use a specific Rust version for reproducibility. Choose one that matches your development environment. +# Using slim variant for smaller base image +FROM rust:1.88 as builder + +# Set the working directory inside the container +WORKDIR /usr/src/app + +# Install build dependencies if needed (e.g., git for cloning) +RUN apt-get update && apt-get install -y --no-install-recommends \ + pkg-config libssl3 \ + ca-certificates \ + 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/songparser* # Clean up dummy build artifacts (replace songparser) + +# 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 ubuntu:24.04 + +# Install runtime dependencies if needed (e.g., SSL certificates) +RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/* + +# Set the working directory +WORKDIR /usr/local/bin + +# Copy the compiled binary from the builder stage +# Replace 'songparser' with the actual name of your binary (usually the crate name) +COPY --from=builder /usr/src/app/target/release/songparser . + +# 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 +# Ensure this matches the binary name copied above +CMD ["./songparser"] diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..2f11b07 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,12 @@ +version: '3.8' # Use a recent version + +services: + # Your Rust Application Service + songparser: + build: # Tells docker-compose to build the Dockerfile in the current directory + context: . + ssh: ["default"] # Uses host's SSH agent + container_name: songparser # Optional: Give the container a specific name + env_file: + - .env + restart: unless-stopped # Optional: Restart policy diff --git a/src/main.rs b/src/main.rs index 86b306c..7dac71c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,6 +16,9 @@ async fn main() -> Result<(), Box> { auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().await, ..Default::default() }; + println!("Base URL: {:?}", app.uri); + println!("Auth URL: {:?}", app.auth_uri); + match auth::get_token(&app).await { Ok(login_result) => { app.token = login_result; @@ -27,8 +30,6 @@ async fn main() -> Result<(), Box> { }; loop { - println!("Base URL: {:?}", app.uri); - println!("Auth URL: {:?}", app.auth_uri); println!("Token: {:?}", app.token); if auth::did_token_expire(&app.token).await {