From c3a3ce58bada7124d7144205b4208f157b345535 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 17 Jul 2026 15:58:20 -0400 Subject: [PATCH] Updating name --- .gitea/workflows/workflow.yml | 2 +- Cargo.lock | 50 +++++++++++++++++------------------ Cargo.toml | 2 +- Dockerfile | 25 +++--------------- README.md | 3 ++- docker-compose.yaml | 6 ++--- 6 files changed, 35 insertions(+), 53 deletions(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 8b17200..87f0eee 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -1,4 +1,4 @@ -name: icarus_auth Build +name: soaricarus_auth Build on: push: diff --git a/Cargo.lock b/Cargo.lock index 37463ce..1900c29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,31 +781,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "icarus_auth" -version = "0.8.1" -dependencies = [ - "argon2", - "axum", - "http-body-util", - "icarus_envy", - "icarus_models", - "josekit", - "openssl", - "serde", - "serde_json", - "sqlx", - "time", - "tokio", - "tower", - "tower-http", - "tracing-subscriber", - "url", - "utoipa", - "utoipa-swagger-ui", - "uuid", -] - [[package]] name = "icarus_envy" version = "0.8.0" @@ -1604,6 +1579,31 @@ dependencies = [ "serde", ] +[[package]] +name = "soaricarus_auth" +version = "0.8.1" +dependencies = [ + "argon2", + "axum", + "http-body-util", + "icarus_envy", + "icarus_models", + "josekit", + "openssl", + "serde", + "serde_json", + "sqlx", + "time", + "tokio", + "tower", + "tower-http", + "tracing-subscriber", + "url", + "utoipa", + "utoipa-swagger-ui", + "uuid", +] + [[package]] name = "socket2" version = "0.6.4" diff --git a/Cargo.toml b/Cargo.toml index 5b5e0a9..16e2c97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "icarus_auth" +name = "soaricarus_auth" version = "0.8.1" edition = "2024" rust-version = "1.95" diff --git a/Dockerfile b/Dockerfile index e5952ad..6aa3fb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,8 @@ -# 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.96.1 as builder # Set the working directory inside the container WORKDIR /usr/src/app -# Install build dependencies if needed (e.g., for certain crates like sqlx with native TLS) -# RUN apt-get update && apt-get install -y pkg-config libssl-dev - # Install build dependencies if needed (e.g., git for cloning) RUN apt-get update && apt-get install -y --no-install-recommends \ pkg-config libssl3 \ @@ -16,36 +10,25 @@ 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/icarus_auth* # Clean up dummy build artifacts (replace icarus_auth) + rm -rf src target/release/deps/soaricarus_auth* -# Copy the actual source code COPY src ./src # If you have other directories like `templates` or `static`, copy them too COPY .env ./.env COPY migrations ./migrations -# << --- 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) @@ -55,17 +38,15 @@ RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && r WORKDIR /usr/local/bin # Copy the compiled binary from the builder stage -# Replace 'icarus_auth' with the actual name of your binary (usually the crate name) -COPY --from=builder /usr/src/app/target/release/icarus_auth . +COPY --from=builder /usr/src/app/target/release/soaricarus_auth . # 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 . COPY --from=builder /usr/src/app/migrations ./migrations -# Expose the port your Axum app listens on (e.g., 3000 or 8000) EXPOSE 8001 # Set the command to run your application # Ensure this matches the binary name copied above -CMD ["./icarus_auth"] +CMD ["./soaricarus_auth"] diff --git a/README.md b/README.md index a0cdba5..fe934af 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -A auth web API services for the Icarus project. +# soaricarus_auth +A auth web API services for the soaricarus project. # Getting Started diff --git a/docker-compose.yaml b/docker-compose.yaml index 62d9ff3..8134a4b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: build: context: . ssh: ["default"] - container_name: icarus_auth + container_name: soaricarus_auth ports: - "8001:8001" env_file: @@ -17,11 +17,11 @@ services: auth_db: image: postgres:18.4-alpine - container_name: icarus_auth_db + container_name: soaricarus_auth_db environment: POSTGRES_USER: ${POSTGRES_AUTH_USER:-icarus_op} POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password} - POSTGRES_DB: ${POSTGRES_AUTH_DB:-icarus_auth_db} + POSTGRES_DB: ${POSTGRES_AUTH_DB:-soaricarus_auth_db} volumes: - postgres_data:/var/lib/postgresql ports: []