Compare commits
1 Commits
chore/cont
...
feat/incre
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b4f3525f6 |
@@ -1,71 +0,0 @@
|
|||||||
# Gitea Actions
|
|
||||||
|
|
||||||
The [`deploy`](workflows/deploy.yml) workflow runs on every push to `main`
|
|
||||||
(and via manual `workflow_dispatch`). It tests, builds, pushes the images
|
|
||||||
to a private registry, and rolls the stack over by SSH on the target host.
|
|
||||||
|
|
||||||
## Required secrets
|
|
||||||
|
|
||||||
Set under *Repo Settings → Actions → Secrets*:
|
|
||||||
|
|
||||||
| Name | Example | Purpose |
|
|
||||||
| -------------------- | ------------------------ | ---------------------------------------------------------------- |
|
|
||||||
| `REGISTRY_URL` | `registry.example.com` | Registry host. No scheme, no trailing slash. |
|
|
||||||
| `REGISTRY_USERNAME` | `mangalord-ci` | `docker login` user. |
|
|
||||||
| `REGISTRY_PASSWORD` | `<token>` | `docker login` token/password. |
|
|
||||||
| `SSH_HOST` | `mangalord.example.com` | Deploy target hostname/IP. |
|
|
||||||
| `SSH_USER` | `deploy` | SSH user on the target (must be in the `docker` group). |
|
|
||||||
| `SSH_PRIVATE_KEY` | `-----BEGIN OPENSSH...` | Private key authorised in the target user's `authorized_keys`. |
|
|
||||||
| `SSH_PORT` | `22` | Optional. Defaults to `22` if unset. |
|
|
||||||
|
|
||||||
## Required variables
|
|
||||||
|
|
||||||
Set under *Repo Settings → Actions → Variables* (not secrets — they appear
|
|
||||||
in logs):
|
|
||||||
|
|
||||||
| Name | Example | Purpose |
|
|
||||||
| ------------- | ------------------------ | ---------------------------------------------------------------------- |
|
|
||||||
| `DEPLOY_PATH` | `/srv/mangalord` | Directory on target holding `docker-compose.yml`, `.env`, and the prod overlay. |
|
|
||||||
|
|
||||||
## One-time host setup
|
|
||||||
|
|
||||||
The workflow assumes the deploy target already has:
|
|
||||||
|
|
||||||
1. Docker + Docker Compose v2 installed and the `SSH_USER` in the `docker` group.
|
|
||||||
2. `$DEPLOY_PATH/docker-compose.yml` (copy of the repo's [docker-compose.yml](../docker-compose.yml)).
|
|
||||||
3. `$DEPLOY_PATH/docker-compose.prod.yml` (copy of the repo's [docker-compose.prod.yml](../docker-compose.prod.yml)).
|
|
||||||
4. `$DEPLOY_PATH/.env` populated from [.env.example](../.env.example) with production values (real `POSTGRES_PASSWORD`, `COOKIE_SECURE=true`, etc.).
|
|
||||||
|
|
||||||
Bootstrap once:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
ssh deploy@mangalord.example.com
|
|
||||||
sudo mkdir -p /srv/mangalord && sudo chown deploy:deploy /srv/mangalord
|
|
||||||
cd /srv/mangalord
|
|
||||||
# place docker-compose.yml, docker-compose.prod.yml, and .env here
|
|
||||||
```
|
|
||||||
|
|
||||||
The first workflow run will pull the images, bring the stack up, and run
|
|
||||||
the embedded migrations on startup.
|
|
||||||
|
|
||||||
## Image tags
|
|
||||||
|
|
||||||
Every push produces three tags per image:
|
|
||||||
|
|
||||||
- `mangalord-{backend,frontend}:latest`
|
|
||||||
- `mangalord-{backend,frontend}:<git-sha>` — used by the deploy job; lets
|
|
||||||
you pin a deploy to a specific commit
|
|
||||||
- `mangalord-{backend,frontend}:<version>` — the version from
|
|
||||||
[backend/Cargo.toml](../backend/Cargo.toml) (verified in lockstep with
|
|
||||||
[frontend/package.json](../frontend/package.json))
|
|
||||||
|
|
||||||
## Rollback
|
|
||||||
|
|
||||||
SSH to the target, set `IMAGE_TAG` to a previous commit SHA, and re-up:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd /srv/mangalord
|
|
||||||
export REGISTRY_URL=registry.example.com
|
|
||||||
export IMAGE_TAG=<previous-sha>
|
|
||||||
docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d
|
|
||||||
```
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
name: deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test-backend:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
image: rust:1-slim
|
|
||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
env:
|
|
||||||
POSTGRES_USER: mangalord
|
|
||||||
POSTGRES_PASSWORD: mangalord
|
|
||||||
POSTGRES_DB: mangalord
|
|
||||||
options: >-
|
|
||||||
--health-cmd "pg_isready -U mangalord"
|
|
||||||
--health-interval 5s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 10
|
|
||||||
env:
|
|
||||||
DATABASE_URL: postgres://mangalord:mangalord@postgres:5432/mangalord
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Install build deps
|
|
||||||
run: |
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y --no-install-recommends pkg-config libssl-dev ca-certificates
|
|
||||||
- name: Cache cargo registry and target
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cargo/registry
|
|
||||||
~/.cargo/git
|
|
||||||
backend/target
|
|
||||||
key: cargo-${{ runner.os }}-${{ hashFiles('backend/Cargo.lock') }}
|
|
||||||
restore-keys: |
|
|
||||||
cargo-${{ runner.os }}-
|
|
||||||
- name: cargo test
|
|
||||||
working-directory: backend
|
|
||||||
run: cargo test --locked
|
|
||||||
|
|
||||||
test-frontend:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '22'
|
|
||||||
cache: npm
|
|
||||||
cache-dependency-path: frontend/package-lock.json
|
|
||||||
- name: npm ci
|
|
||||||
working-directory: frontend
|
|
||||||
run: npm ci
|
|
||||||
- name: vitest
|
|
||||||
working-directory: frontend
|
|
||||||
run: npm test
|
|
||||||
|
|
||||||
build-and-push:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: [test-backend, test-frontend]
|
|
||||||
outputs:
|
|
||||||
image_tag: ${{ steps.meta.outputs.image_tag }}
|
|
||||||
version: ${{ steps.meta.outputs.version }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Resolve image tags
|
|
||||||
id: meta
|
|
||||||
run: |
|
|
||||||
version="$(grep -m1 '^version' backend/Cargo.toml | cut -d'"' -f2)"
|
|
||||||
frontend_version="$(grep -m1 '"version"' frontend/package.json | cut -d'"' -f4)"
|
|
||||||
if [ "$version" != "$frontend_version" ]; then
|
|
||||||
echo "Version mismatch: backend=$version frontend=$frontend_version" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "image_tag=${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
|
|
||||||
echo "version=${version}" >> "$GITHUB_OUTPUT"
|
|
||||||
|
|
||||||
- uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: docker login
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ${{ secrets.REGISTRY_URL }}
|
|
||||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Build & push backend
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: ./backend
|
|
||||||
push: true
|
|
||||||
tags: |
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-backend:latest
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-backend:${{ steps.meta.outputs.image_tag }}
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-backend:${{ steps.meta.outputs.version }}
|
|
||||||
cache-from: type=gha,scope=backend
|
|
||||||
cache-to: type=gha,mode=max,scope=backend
|
|
||||||
|
|
||||||
- name: Build & push frontend
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: ./frontend
|
|
||||||
push: true
|
|
||||||
tags: |
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-frontend:latest
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-frontend:${{ steps.meta.outputs.image_tag }}
|
|
||||||
${{ secrets.REGISTRY_URL }}/mangalord-frontend:${{ steps.meta.outputs.version }}
|
|
||||||
cache-from: type=gha,scope=frontend
|
|
||||||
cache-to: type=gha,mode=max,scope=frontend
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build-and-push
|
|
||||||
steps:
|
|
||||||
- name: SSH deploy
|
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
|
||||||
with:
|
|
||||||
host: ${{ secrets.SSH_HOST }}
|
|
||||||
username: ${{ secrets.SSH_USER }}
|
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
port: ${{ secrets.SSH_PORT || 22 }}
|
|
||||||
envs: REGISTRY_URL,REGISTRY_USERNAME,REGISTRY_PASSWORD,IMAGE_TAG,DEPLOY_PATH
|
|
||||||
script_stop: true
|
|
||||||
script: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd "$DEPLOY_PATH"
|
|
||||||
echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_URL" -u "$REGISTRY_USERNAME" --password-stdin
|
|
||||||
export REGISTRY_URL IMAGE_TAG
|
|
||||||
docker compose -f docker-compose.yml -f docker-compose.prod.yml pull
|
|
||||||
docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d
|
|
||||||
docker image prune -f
|
|
||||||
docker logout "$REGISTRY_URL"
|
|
||||||
env:
|
|
||||||
REGISTRY_URL: ${{ secrets.REGISTRY_URL }}
|
|
||||||
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
|
||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
IMAGE_TAG: ${{ needs.build-and-push.outputs.image_tag }}
|
|
||||||
DEPLOY_PATH: ${{ vars.DEPLOY_PATH }}
|
|
||||||
2
backend/Cargo.lock
generated
2
backend/Cargo.lock
generated
@@ -1470,7 +1470,7 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.34.0"
|
version = "0.33.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "mangalord"
|
name = "mangalord"
|
||||||
version = "0.34.0"
|
version = "0.33.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "mangalord"
|
default-run = "mangalord"
|
||||||
|
|
||||||
|
|||||||
@@ -19,49 +19,12 @@ COPY migrations ./migrations
|
|||||||
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
RUN touch src/main.rs src/lib.rs && cargo build --locked --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
# `curl` is for the container HEALTHCHECK; `ca-certificates` is for
|
|
||||||
# outbound HTTPS (crawler covers/pages).
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends ca-certificates curl \
|
&& apt-get install -y --no-install-recommends ca-certificates \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Non-root runtime user. The API binary doesn't need any root
|
|
||||||
# privilege; the crawler daemon's Chromium launcher uses --no-sandbox
|
|
||||||
# precisely because user-namespace sandboxing is fragile, so dropping
|
|
||||||
# privileges costs nothing operationally and shrinks the blast radius
|
|
||||||
# of any RCE.
|
|
||||||
ARG APP_UID=10001
|
|
||||||
ARG APP_GID=10001
|
|
||||||
RUN groupadd --system --gid ${APP_GID} app \
|
|
||||||
&& useradd --system --uid ${APP_UID} --gid app --home-dir /home/app --create-home --shell /usr/sbin/nologin app
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
COPY --from=builder /app/target/release/mangalord /usr/local/bin/mangalord
|
||||||
COPY --from=builder /app/migrations /app/migrations
|
COPY --from=builder /app/migrations /app/migrations
|
||||||
|
|
||||||
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
ENV STORAGE_DIR=/var/lib/mangalord/storage
|
||||||
# Pre-create the storage dir so the entrypoint doesn't need to
|
|
||||||
# mkdir-as-root and so the named volume mount inherits the right
|
|
||||||
# ownership.
|
|
||||||
#
|
|
||||||
# UPGRADE NOTE for operators: if you're moving from an older image
|
|
||||||
# that ran as root, the existing `storage-data` volume has files owned
|
|
||||||
# by UID 0 and the new UID-10001 user can't write them. Run once
|
|
||||||
# before the upgrade:
|
|
||||||
# docker compose run --rm --user 0 backend \
|
|
||||||
# chown -R 10001:10001 /var/lib/mangalord/storage
|
|
||||||
# (Postgres is unaffected — that image's `postgres` user UID hasn't
|
|
||||||
# changed.)
|
|
||||||
RUN mkdir -p ${STORAGE_DIR} \
|
|
||||||
&& chown -R app:app ${STORAGE_DIR} /app /home/app
|
|
||||||
|
|
||||||
USER app
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
# `--start-period` is generous because first boot runs sqlx::migrate
|
|
||||||
# against postgres which can take a few seconds; subsequent restarts
|
|
||||||
# are sub-second.
|
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
|
|
||||||
CMD curl -fsS http://localhost:8080/api/v1/health > /dev/null || exit 1
|
|
||||||
|
|
||||||
CMD ["mangalord"]
|
CMD ["mangalord"]
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
# Production overlay: layer on top of docker-compose.yml on the deploy
|
|
||||||
# host so the backend and frontend run from pre-built registry images
|
|
||||||
# instead of building locally.
|
|
||||||
#
|
|
||||||
# docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d
|
|
||||||
#
|
|
||||||
# REGISTRY_URL and IMAGE_TAG are injected by .gitea/workflows/deploy.yml
|
|
||||||
# at deploy time. IMAGE_TAG defaults to `latest` so a manual
|
|
||||||
# `docker compose ... up -d` on the host still works.
|
|
||||||
|
|
||||||
services:
|
|
||||||
backend:
|
|
||||||
build: !reset null
|
|
||||||
image: ${REGISTRY_URL}/mangalord-backend:${IMAGE_TAG:-latest}
|
|
||||||
pull_policy: always
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
frontend:
|
|
||||||
build: !reset null
|
|
||||||
image: ${REGISTRY_URL}/mangalord-frontend:${IMAGE_TAG:-latest}
|
|
||||||
pull_policy: always
|
|
||||||
restart: unless-stopped
|
|
||||||
@@ -1,11 +1,7 @@
|
|||||||
FROM node:22-alpine AS builder
|
FROM node:22-alpine AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json package-lock.json* ./
|
||||||
# `npm ci` installs the locked versions exactly; `npm install` would
|
RUN npm install
|
||||||
# silently rewrite package-lock.json mid-build. CI (.gitea/workflows)
|
|
||||||
# also uses `npm ci`, so this keeps the image build deterministic and
|
|
||||||
# matches what the test job validated.
|
|
||||||
RUN npm ci
|
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
@@ -14,20 +10,8 @@ WORKDIR /app
|
|||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
ENV HOST=0.0.0.0
|
ENV HOST=0.0.0.0
|
||||||
ENV PORT=3000
|
ENV PORT=3000
|
||||||
|
COPY --from=builder /app/build ./build
|
||||||
# node:22-alpine ships a `node` user (UID 1000); use it instead of
|
COPY --from=builder /app/node_modules ./node_modules
|
||||||
# running the SvelteKit server as root.
|
COPY --from=builder /app/package.json ./
|
||||||
COPY --from=builder --chown=node:node /app/build ./build
|
|
||||||
COPY --from=builder --chown=node:node /app/node_modules ./node_modules
|
|
||||||
COPY --from=builder --chown=node:node /app/package.json ./
|
|
||||||
|
|
||||||
USER node
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
# Alpine's busybox `wget` is the canonical lightweight HTTP probe.
|
|
||||||
# `--spider` doesn't follow redirects; `node build` serves a 200 on
|
|
||||||
# `/` for the homepage so this works without a dedicated /health.
|
|
||||||
HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
|
|
||||||
CMD wget -q --spider http://localhost:3000/ || exit 1
|
|
||||||
|
|
||||||
CMD ["node", "build"]
|
CMD ["node", "build"]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mangalord-frontend",
|
"name": "mangalord-frontend",
|
||||||
"version": "0.34.0",
|
"version": "0.33.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user