Compare commits

...
Author SHA1 Message Date
phoenix c3a3ce58ba Updating name
soaricarus_auth Build / Rustfmt (pull_request) Successful in 32s
soaricarus_auth Build / Clippy (pull_request) Successful in 1m28s
soaricarus_auth Build / Test Suite (pull_request) Successful in 2m57s
soaricarus_auth Build / Check (pull_request) Successful in 3m32s
soaricarus_auth Build / build (pull_request) Successful in 1m48s
2026-07-17 15:58:20 -04:00
phoenix 2d376524eb Update postgres (#3)
Release Tagging / release (push) Failing after 56s
icarus_auth Build / Check (push) Successful in 2m2s
icarus_auth Build / Test Suite (push) Successful in 2m19s
icarus_auth Build / Rustfmt (push) Successful in 32s
icarus_auth Build / build (push) Successful in 1m44s
icarus_auth Build / Clippy (push) Successful in 2m25s
Reviewed-on: phoenix/icarus_auth#3
2026-07-09 10:35:55 -04:00
6 changed files with 42 additions and 75 deletions
+2 -11
View File
@@ -1,14 +1,12 @@
name: Rust Build
name: soaricarus_auth Build
on:
push:
branches:
- main
- devel
pull_request:
branches:
- main
- devel
jobs:
check:
@@ -34,16 +32,13 @@ jobs:
test:
name: Test Suite
runs-on: ubuntu-24.04
# --- Add database service definition ---
services:
postgres:
image: postgres:18.3-alpine
image: postgres:18.4-alpine
env:
# Use secrets for DB init, with fallbacks for flexibility
POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
# Options to wait until the database is ready
options: >-
--health-cmd pg_isready
--health-interval 10s
@@ -56,7 +51,6 @@ jobs:
with:
toolchain: 1.96.1
- uses: Swatinem/rust-cache@v2
# --- Add this step for explicit verification ---
- name: Verify Docker Environment
run: |
echo "Runner User Info:"
@@ -68,15 +62,12 @@ jobs:
echo "Checking Docker Daemon Status (ps):"
docker ps -a
echo "Docker environment check complete."
# NOTE: Do NOT use continue-on-error here.
# If Docker isn't working as expected, the job SHOULD fail here.
- name: Run tests
env:
# Define DATABASE_URL for tests to use
DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
RUST_LOG: info # Optional: configure test log level
SECRET_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
# Make SSH agent available if tests fetch private dependencies
SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
ENABLE_REGISTRATION: 'TRUE'
run: |
Generated
+25 -25
View File
@@ -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"
+1 -1
View File
@@ -1,5 +1,5 @@
[package]
name = "icarus_auth"
name = "soaricarus_auth"
version = "0.8.1"
edition = "2024"
rust-version = "1.95"
+3 -22
View File
@@ -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"]
+2 -1
View File
@@ -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
+9 -15
View File
@@ -1,33 +1,28 @@
version: '3.8' # Use a recent version
services:
# Your Rust Application Service
auth_api:
build: # Tells docker-compose to build the Dockerfile in the current directory
build:
context: .
ssh: ["default"] # Uses host's SSH agent
container_name: icarus_auth # Optional: Give the container a specific name
ssh: ["default"]
container_name: soaricarus_auth
ports:
# Map host port 8000 to container port 3000 (adjust as needed)
- "8001:8001"
env_file:
- .env
depends_on:
auth_db:
condition: service_healthy # Wait for the DB to be healthy before starting the app
restart: unless-stopped # Optional: Restart policy
condition: service_healthy
restart: unless-stopped
# PostgreSQL Database Service
auth_db:
image: postgres:18.3-alpine # Use an official Postgres image (Alpine variant is smaller)
container_name: icarus_auth_db # Optional: Give the container a specific name
image: postgres:18.4-alpine
container_name: soaricarus_auth_db
environment:
# These MUST match the user, password, and database name in the DATABASE_URL above
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:
# Persist database data using a named volume
- postgres_data:/var/lib/postgresql
ports: []
healthcheck:
@@ -37,9 +32,8 @@ services:
timeout: 5s
retries: 5
start_period: 10s
restart: always # Optional: Restart policy
restart: always
# Define the named volume for data persistence
volumes:
postgres_data:
driver: local # Use the default local driver