Compare commits

...

4 Commits

Author SHA1 Message Date
6917ccf487 tsk-42: Dockerized the service
All checks were successful
Rust Build / Check (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 31s
Rust Build / Test Suite (pull_request) Successful in 22s
Rust Build / Clippy (pull_request) Successful in 26s
Rust Build / build (pull_request) Successful in 48s
2025-08-16 18:39:57 -04:00
1ed736d116 tsk-42: Updating exposed port for docker 2025-08-16 15:41:48 -04:00
12b1c61628 tsk-42: Updating sample docker env file
All checks were successful
Rust Build / Check (pull_request) Successful in 29s
Rust Build / Test Suite (pull_request) Successful in 30s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 30s
Rust Build / build (pull_request) Successful in 36s
2025-08-15 15:03:00 -04:00
b110066a61 tsk-42: Adding initial docker file
All checks were successful
Rust Build / Check (pull_request) Successful in 30s
Rust Build / Test Suite (pull_request) Successful in 34s
Rust Build / Rustfmt (pull_request) Successful in 24s
Rust Build / Clippy (pull_request) Successful in 29s
Rust Build / build (pull_request) Successful in 38s
2025-08-15 14:51:52 -04:00
5 changed files with 105 additions and 5 deletions

18
.dockerignore.yaml Normal file
View File

@@ -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

View File

@@ -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://localhost:8000
ICARUS_AUTH_BASE_API_URL=http://localhost:8001
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH

66
Dockerfile Normal file
View File

@@ -0,0 +1,66 @@
# 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 .
# Expose the port your Axum app listens on (e.g., 3000 or 8000)
# EXPOSE 3000
# Set the command to run your application
# Ensure this matches the binary name copied above
CMD ["./songparser"]

15
docker-compose.yaml Normal file
View File

@@ -0,0 +1,15 @@
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
# ports:
# Map host port 8000 to container port 3000 (adjust as needed)
# - "8002:3002"
env_file:
- .env
restart: unless-stopped # Optional: Restart policy

View File

@@ -16,6 +16,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
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<dyn std::error::Error>> {
};
loop {
println!("Base URL: {:?}", app.uri);
println!("Auth URL: {:?}", app.auth_uri);
println!("Token: {:?}", app.token);
if auth::did_token_expire(&app.token).await {