Compare commits
7 Commits
v0.3.2-dev
...
v0.3.4-dev
Author | SHA1 | Date | |
---|---|---|---|
2c30abb5c6 | |||
1817ab01d6 | |||
31be156be3 | |||
fc6b66f2e6 | |||
6dec9942cc | |||
a855db9ecc | |||
17af1a00c0 |
21
.dockerignore.yaml
Normal file
21
.dockerignore.yaml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
# Add any other files/directories you don't need in the image
|
||||||
|
# e.g., logs/, tmp/
|
@@ -1,2 +1,6 @@
|
|||||||
DATABASE_URL=postgres://username:password@localhost/database_name
|
SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
|
||||||
SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
|
POSTGRES_USER=icarus_op_test
|
||||||
|
POSTGRES_PASSWORD=password
|
||||||
|
POSTGRES_DB=icarus_auth_test_db
|
||||||
|
POSTGRES_HOST=localhost
|
||||||
|
DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}
|
@@ -4,8 +4,6 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- devel
|
- devel
|
||||||
tags:
|
|
||||||
- 'v*' # Trigger on tags matching v*
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -52,6 +50,4 @@ jobs:
|
|||||||
body: |
|
body: |
|
||||||
Release of version ${{ steps.version.outputs.project_tag_release }}
|
Release of version ${{ steps.version.outputs.project_tag_release }}
|
||||||
# draft: false
|
# draft: false
|
||||||
# prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag
|
# prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag
|
||||||
|
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
/target
|
/target
|
||||||
Cargo.lock
|
Cargo.lock
|
||||||
.env
|
.env
|
||||||
|
.env.docker
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_auth"
|
name = "icarus_auth"
|
||||||
version = "0.3.2"
|
version = "0.3.4"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.86"
|
rust-version = "1.86"
|
||||||
|
|
||||||
|
71
Dockerfile
Normal file
71
Dockerfile
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
# 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.86 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 \
|
||||||
|
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/icarus_auth* # Clean up dummy build artifacts (replace icarus_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 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 'icarus_auth' with the actual name of your binary (usually the crate name)
|
||||||
|
COPY --from=builder /usr/src/app/target/release/icarus_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 3000
|
||||||
|
|
||||||
|
# Set the command to run your application
|
||||||
|
# Ensure this matches the binary name copied above
|
||||||
|
CMD ["./icarus_auth"]
|
26
README.md
Normal file
26
README.md
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
|
||||||
|
# Getting Started
|
||||||
|
Copy the `.env.sample` file to `.env` and ensure that the variables are populated. This project
|
||||||
|
can be used with regular hosting or with docker. For the sake of getting up to speed quickly,
|
||||||
|
Docker will be covered. Make sure docker is running and your ssh identity has been loaded.
|
||||||
|
|
||||||
|
Build image
|
||||||
|
```
|
||||||
|
docker compose build
|
||||||
|
```
|
||||||
|
|
||||||
|
Start images
|
||||||
|
```
|
||||||
|
docker compose up -d --force-recreate
|
||||||
|
```
|
||||||
|
|
||||||
|
Bring it down
|
||||||
|
```
|
||||||
|
docker compose down -v
|
||||||
|
```
|
||||||
|
|
||||||
|
Pruning
|
||||||
|
```
|
||||||
|
docker system prune -a
|
||||||
|
```
|
45
docker-compose.yaml
Normal file
45
docker-compose.yaml
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
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
|
||||||
|
context: .
|
||||||
|
ssh: ["default"] # Uses host's SSH agent
|
||||||
|
container_name: icarus_auth # Optional: Give the container a specific name
|
||||||
|
ports:
|
||||||
|
# Map host port 8000 to container port 3000 (adjust as needed)
|
||||||
|
- "8000:3000"
|
||||||
|
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
|
||||||
|
|
||||||
|
# PostgreSQL Database Service
|
||||||
|
auth_db:
|
||||||
|
image: postgres:17.4-alpine # Use an official Postgres image (Alpine variant is smaller)
|
||||||
|
container_name: icarus_auth_db # Optional: Give the container a specific name
|
||||||
|
environment:
|
||||||
|
# These MUST match the user, password, and database name in the DATABASE_URL above
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER:-icarus_op}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB:-icarus_auth}
|
||||||
|
volumes:
|
||||||
|
# Persist database data using a named volume
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
ports: []
|
||||||
|
healthcheck:
|
||||||
|
# Checks if Postgres is ready to accept connections
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
restart: always # Optional: Restart policy
|
||||||
|
|
||||||
|
# Define the named volume for data persistence
|
||||||
|
volumes:
|
||||||
|
postgres_data:
|
||||||
|
driver: local # Use the default local driver
|
@@ -36,7 +36,6 @@ pub mod db {
|
|||||||
async fn get_db_url() -> String {
|
async fn get_db_url() -> String {
|
||||||
#[cfg(debug_assertions)] // Example: Only load .env in debug builds
|
#[cfg(debug_assertions)] // Example: Only load .env in debug builds
|
||||||
dotenvy::dotenv().ok();
|
dotenvy::dotenv().ok();
|
||||||
|
|
||||||
env::var(keys::DBURL).expect(keys::error::ERROR)
|
env::var(keys::DBURL).expect(keys::error::ERROR)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -74,6 +74,7 @@ mod tests {
|
|||||||
pub const LIMIT: usize = 6;
|
pub const LIMIT: usize = 6;
|
||||||
|
|
||||||
pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
|
pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
|
||||||
|
dotenvy::dotenv().ok(); // Load .env file if it exists
|
||||||
let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present");
|
let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present");
|
||||||
let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
|
let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
|
||||||
sqlx::PgPool::connect_with(tm_options).await
|
sqlx::PgPool::connect_with(tm_options).await
|
||||||
|
Reference in New Issue
Block a user