Add a docker build step.
Some checks failed
Check / Build and Push Backend Image (pull_request) Has been skipped
Check / Backend (pull_request) Failing after 2m24s
Check / Frontend (pull_request) Failing after 2m0s
Check / Build and Push Frontend Image (pull_request) Has been skipped

This commit is contained in:
Drew 2025-09-27 20:28:17 -07:00
parent ff6837a751
commit 1b3dfef45b
8 changed files with 183 additions and 4 deletions

View file

@ -87,3 +87,81 @@ jobs:
run: npm run test run: npm run test
working-directory: frontend working-directory: frontend
docker-backend:
name: Build and Push Backend Image
runs-on: docker
needs: [check-backend]
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout Repo
uses: https://github.com/actions/checkout@v4
- name: Set up Docker Buildx
uses: https://github.com/docker/setup-buildx-action@v3
- name: Login to Forgejo Container Registry
uses: https://github.com/docker/login-action@v3
with:
registry: ${{ gitea.server_url }}
username: ${{ gitea.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata
id: meta
uses: https://github.com/docker/metadata-action@v5
with:
images: ${{ gitea.server_url }}/${{ gitea.repository }}/backend
tags: |
type=ref,event=branch
type=sha,prefix={{branch}}-
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push image
uses: https://github.com/docker/build-push-action@v5
with:
context: ./backend
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
docker-frontend:
name: Build and Push Frontend Image
runs-on: docker
needs: [check-frontend]
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout Repo
uses: https://github.com/actions/checkout@v4
- name: Set up Docker Buildx
uses: https://github.com/docker/setup-buildx-action@v3
- name: Login to Forgejo Container Registry
uses: https://github.com/docker/login-action@v3
with:
registry: ${{ gitea.server_url }}
username: ${{ gitea.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata
id: meta
uses: https://github.com/docker/metadata-action@v5
with:
images: ${{ gitea.server_url }}/${{ gitea.repository }}/frontend
tags: |
type=ref,event=branch
type=sha,prefix={{branch}}-
type=raw,value=latest,enable={{is_default_branch}}
- name: Build and push image
uses: https://github.com/docker/build-push-action@v5
with:
context: ./frontend
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

View file

@ -12,6 +12,7 @@ chrono = { version = "0.4.41", features = ["serde"] }
serde = "1.0.219" serde = "1.0.219"
sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] } sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
tokio = { version = "1.47.1", features = ["rt-multi-thread", "tracing"] } tokio = { version = "1.47.1", features = ["rt-multi-thread", "tracing"] }
tower-http = { version = "0.6.0", features = ["cors"] }
tracing = "0.1.41" tracing = "0.1.41"
tracing-subscriber = "0.3.19" tracing-subscriber = "0.3.19"
uuid = { version = "1.18.0", features = ["serde", "v4"] } uuid = { version = "1.18.0", features = ["serde", "v4"] }

47
backend/Dockerfile Normal file
View file

@ -0,0 +1,47 @@
# Multi-stage Dockerfile for Rust backend
FROM rust:1.90-alpine as builder
# Install build dependencies
RUN apk add --no-cache \
musl-dev \
pkgconfig \
openssl-dev \
clang
# Set working directory
WORKDIR /app
# Copy Cargo files for dependency caching
COPY Cargo.toml Cargo.lock ./
# Create a dummy main.rs to build dependencies
RUN mkdir src && echo "fn main() {}" > src/main.rs
# Build dependencies (cached layer)
RUN cargo build --release && rm -rf src/
# Copy source code
COPY src/ src/
COPY migrations/ migrations/
# Build the application
RUN cargo build --release
# Runtime stage
FROM alpine:latest
# Install runtime dependencies
RUN apk add --no-cache ca-certificates curl
# Copy the binary from builder stage
COPY --from=builder /app/target/release/backend /usr/local/bin/app
# Expose port
EXPOSE 3000
# Health check
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
CMD curl -f http://localhost:3000/health || exit 1
# Run the application
CMD ["app"]

View file

@ -1,4 +1,5 @@
use axum::{Router, routing::get}; use axum::{Router, routing::get};
use tower_http::cors::{CorsLayer, Any};
mod database; mod database;
mod models; mod models;
@ -13,13 +14,29 @@ async fn main() {
let pool = database::create_pool(&binding) let pool = database::create_pool(&binding)
.await .await
.expect("Failed to create database pool"); .expect("Failed to create database pool");
let cors = if std::env::var("RUST_ENV").unwrap_or_default() == "production" {
CorsLayer::new()
.allow_origin([
"https://tiramisu.one".parse::<axum::http::HeaderValue>().unwrap(),
"https://*.tiramisu.one".parse::<axum::http::HeaderValue>().unwrap()
])
.allow_methods(Any)
.allow_headers(Any)
} else {
CorsLayer::new()
.allow_origin(Any)
.allow_methods(Any)
.allow_headers(Any)
};
let app = Router::new() let app = Router::new()
.route("/health", get(health)) .route("/health", get(health))
.nest("/api/tasks", services::create_task_router()) .nest("/api/tasks", services::create_task_router())
.layer(cors)
.with_state(pool); .with_state(pool);
let port = std::env::var("PORT").unwrap_or("3000".to_string()); let port = std::env::var("PORT").unwrap_or("3000".to_string());
let addr = format!("127.0.0.1:{}", port); let addr = format!("0.0.0.0:{}", port);
let listener = tokio::net::TcpListener::bind(addr).await.unwrap(); let listener = tokio::net::TcpListener::bind(addr).await.unwrap();

36
docker-compose.yml Normal file
View file

@ -0,0 +1,36 @@
version: '3.8'
services:
backend:
build:
context: ./backend
dockerfile: Dockerfile
ports:
- "3000:3000"
environment:
- DATABASE_URL=sqlite:///app/data/local.db
- RUST_LOG=info
volumes:
- backend_data:/app/data
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000/health"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
frontend:
build:
context: ./frontend
dockerfile: Dockerfile
ports:
- "5173:5173"
depends_on:
backend:
condition: service_healthy
environment:
- VITE_API_URL=http://localhost:3000
- API_URL=http://backend:3000
volumes:
backend_data:

View file

@ -6,7 +6,7 @@ import type {
ApiError, ApiError,
} from '~/types/task' } from '~/types/task'
const API_BASE_URL = '/api' const API_BASE_URL = `${import.meta.env.VITE_API_URL || 'http://localhost:3000'}/api`
class ApiClient { class ApiClient {
private async fetchWrapper<T>( private async fetchWrapper<T>(

View file

@ -5,7 +5,7 @@
"scripts": { "scripts": {
"build": "react-router build", "build": "react-router build",
"dev": "react-router dev", "dev": "react-router dev",
"start": "react-router-serve ./build/server/index.js", "start": "PORT=5173 react-router-serve ./build/server/index.js",
"test": "vitest", "test": "vitest",
"test:coverage": "vitest --coverage", "test:coverage": "vitest --coverage",
"test:run": "vitest run", "test:run": "vitest run",

View file

@ -7,7 +7,7 @@ export default defineConfig({
server: { server: {
proxy: { proxy: {
"/api": { "/api": {
target: "http://localhost:3000", target: process.env.VITE_API_URL || "http://127.0.0.1:3000",
changeOrigin: true, changeOrigin: true,
}, },
}, },