Compare commits
5 Commits
38cf1c82a1
...
v4.1.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f74b2b229 | ||
|
|
cb9598a786 | ||
|
|
fc73756308 | ||
|
|
3f436877ee | ||
|
|
812028e50d |
@@ -41,6 +41,9 @@ jobs:
|
|||||||
- name: Build healthcheck
|
- name: Build healthcheck
|
||||||
run: go build -o /dev/null ./cmd/healthcheck
|
run: go build -o /dev/null ./cmd/healthcheck
|
||||||
|
|
||||||
|
- name: Build pocketbase
|
||||||
|
run: go build -o /dev/null ./cmd/pocketbase
|
||||||
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: go test -short -race -count=1 -timeout=60s ./...
|
run: go test -short -race -count=1 -timeout=60s ./...
|
||||||
|
|
||||||
|
|||||||
@@ -147,10 +147,14 @@ jobs:
|
|||||||
# SENTRY_ORG: libnovel
|
# SENTRY_ORG: libnovel
|
||||||
# SENTRY_PROJECT: ui
|
# SENTRY_PROJECT: ui
|
||||||
|
|
||||||
# ── docker: all images in one job (single login) ──────────────────────────────
|
# ── docker: build + push all images via docker bake ──────────────────────────
|
||||||
# backend, runner, ui, and caddy are built sequentially in one job so Docker
|
# docker-bake.hcl defines all five targets. BuildKit builds them with maximum
|
||||||
# Hub only needs to be authenticated once. This also eliminates 3 redundant
|
# parallelism: backend/runner/pocketbase share the Go builder stage (compiled
|
||||||
# checkout + setup-buildx + scheduler round-trips compared to separate jobs.
|
# once), while caddy and ui build concurrently alongside the Go targets.
|
||||||
|
#
|
||||||
|
# Metadata (tags + labels) is generated per-image by docker/metadata-action
|
||||||
|
# (bake-target mode), then merged into a single bake call via the bake-action
|
||||||
|
# targets input — one Docker Hub login, one buildx invocation.
|
||||||
docker:
|
docker:
|
||||||
name: Docker
|
name: Docker
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -160,65 +164,13 @@ jobs:
|
|||||||
|
|
||||||
- uses: docker/setup-buildx-action@v3
|
- uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
# Single login — credential is written to ~/.docker/config.json and
|
|
||||||
# reused by all subsequent build-push-action steps in this job.
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USER }}
|
username: ${{ secrets.DOCKER_USER }}
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
password: ${{ secrets.DOCKER_TOKEN }}
|
||||||
|
|
||||||
# ── backend ──────────────────────────────────────────────────────────────
|
# ── Prepare ui build artifact ─────────────────────────────────────────────
|
||||||
- name: Docker meta / backend
|
|
||||||
id: meta-backend
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: ${{ secrets.DOCKER_USER }}/libnovel-backend
|
|
||||||
tags: |
|
|
||||||
type=semver,pattern={{version}}
|
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=raw,value=latest
|
|
||||||
|
|
||||||
- name: Build and push / backend
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: backend
|
|
||||||
target: backend
|
|
||||||
push: true
|
|
||||||
tags: ${{ steps.meta-backend.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta-backend.outputs.labels }}
|
|
||||||
build-args: |
|
|
||||||
VERSION=${{ steps.meta-backend.outputs.version }}
|
|
||||||
COMMIT=${{ gitea.sha }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-backend:latest
|
|
||||||
cache-to: type=inline
|
|
||||||
|
|
||||||
# ── runner ───────────────────────────────────────────────────────────────
|
|
||||||
- name: Docker meta / runner
|
|
||||||
id: meta-runner
|
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
|
||||||
images: ${{ secrets.DOCKER_USER }}/libnovel-runner
|
|
||||||
tags: |
|
|
||||||
type=semver,pattern={{version}}
|
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=raw,value=latest
|
|
||||||
|
|
||||||
- name: Build and push / runner
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: backend
|
|
||||||
target: runner
|
|
||||||
push: true
|
|
||||||
tags: ${{ steps.meta-runner.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta-runner.outputs.labels }}
|
|
||||||
build-args: |
|
|
||||||
VERSION=${{ steps.meta-runner.outputs.version }}
|
|
||||||
COMMIT=${{ gitea.sha }}
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-runner:latest
|
|
||||||
cache-to: type=inline
|
|
||||||
|
|
||||||
# ── ui ───────────────────────────────────────────────────────────────────
|
|
||||||
- name: Download ui build artifacts
|
- name: Download ui build artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
@@ -230,51 +182,121 @@ jobs:
|
|||||||
grep -v '^build$' ui/.dockerignore > ui/.dockerignore.tmp
|
grep -v '^build$' ui/.dockerignore > ui/.dockerignore.tmp
|
||||||
mv ui/.dockerignore.tmp ui/.dockerignore
|
mv ui/.dockerignore.tmp ui/.dockerignore
|
||||||
|
|
||||||
|
# ── Generate per-image tags + labels (bake-target mode) ───────────────────
|
||||||
|
- name: Docker meta / backend
|
||||||
|
id: meta-backend
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ secrets.DOCKER_USER }}/libnovel-backend
|
||||||
|
bake-target: backend
|
||||||
|
tags: |
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
|
type=raw,value=latest
|
||||||
|
|
||||||
|
- name: Docker meta / runner
|
||||||
|
id: meta-runner
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ secrets.DOCKER_USER }}/libnovel-runner
|
||||||
|
bake-target: runner
|
||||||
|
tags: |
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
|
type=raw,value=latest
|
||||||
|
|
||||||
|
- name: Docker meta / pocketbase
|
||||||
|
id: meta-pocketbase
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ secrets.DOCKER_USER }}/libnovel-pocketbase
|
||||||
|
bake-target: pocketbase
|
||||||
|
tags: |
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
|
type=raw,value=latest
|
||||||
|
|
||||||
- name: Docker meta / ui
|
- name: Docker meta / ui
|
||||||
id: meta-ui
|
id: meta-ui
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: ${{ secrets.DOCKER_USER }}/libnovel-ui
|
images: ${{ secrets.DOCKER_USER }}/libnovel-ui
|
||||||
|
bake-target: ui
|
||||||
tags: |
|
tags: |
|
||||||
type=semver,pattern={{version}}
|
type=semver,pattern={{version}}
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
|
|
||||||
- name: Build and push / ui
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: ui
|
|
||||||
push: true
|
|
||||||
tags: ${{ steps.meta-ui.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta-ui.outputs.labels }}
|
|
||||||
build-args: |
|
|
||||||
BUILD_VERSION=${{ steps.meta-ui.outputs.version }}
|
|
||||||
BUILD_COMMIT=${{ gitea.sha }}
|
|
||||||
BUILD_TIME=${{ gitea.event.head_commit.timestamp }}
|
|
||||||
PREBUILT=1
|
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-ui:latest
|
|
||||||
cache-to: type=inline
|
|
||||||
|
|
||||||
# ── caddy ────────────────────────────────────────────────────────────────
|
|
||||||
- name: Docker meta / caddy
|
- name: Docker meta / caddy
|
||||||
id: meta-caddy
|
id: meta-caddy
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: ${{ secrets.DOCKER_USER }}/libnovel-caddy
|
images: ${{ secrets.DOCKER_USER }}/libnovel-caddy
|
||||||
|
bake-target: caddy
|
||||||
tags: |
|
tags: |
|
||||||
type=semver,pattern={{version}}
|
type=semver,pattern={{version}}
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
|
|
||||||
- name: Build and push / caddy
|
# ── Build + push all images in parallel ───────────────────────────────────
|
||||||
uses: docker/build-push-action@v6
|
- name: Build and push all images
|
||||||
|
uses: docker/bake-action@v6
|
||||||
with:
|
with:
|
||||||
context: caddy
|
files: |
|
||||||
push: true
|
docker-bake.hcl
|
||||||
tags: ${{ steps.meta-caddy.outputs.tags }}
|
${{ steps.meta-backend.outputs.bake-file }}
|
||||||
labels: ${{ steps.meta-caddy.outputs.labels }}
|
${{ steps.meta-runner.outputs.bake-file }}
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-caddy:latest
|
${{ steps.meta-pocketbase.outputs.bake-file }}
|
||||||
cache-to: type=inline
|
${{ steps.meta-ui.outputs.bake-file }}
|
||||||
|
${{ steps.meta-caddy.outputs.bake-file }}
|
||||||
|
set: |
|
||||||
|
backend.args.VERSION=${{ steps.meta-backend.outputs.version }}
|
||||||
|
backend.args.COMMIT=${{ gitea.sha }}
|
||||||
|
runner.args.VERSION=${{ steps.meta-runner.outputs.version }}
|
||||||
|
runner.args.COMMIT=${{ gitea.sha }}
|
||||||
|
ui.args.BUILD_TIME=${{ gitea.event.head_commit.timestamp }}
|
||||||
|
*.output=type=image,push=true
|
||||||
|
|
||||||
|
# ── deploy: sync docker-compose.yml + restart prod ───────────────────────────
|
||||||
|
# Runs after all images are pushed to Docker Hub.
|
||||||
|
# Copies the compose file from the tagged commit to the server, pulls the new
|
||||||
|
# images, and restarts only the services whose image or config changed.
|
||||||
|
# --remove-orphans cleans up containers no longer defined in the compose file
|
||||||
|
# (e.g. the now-removed pb-init container).
|
||||||
|
#
|
||||||
|
# Required Gitea secrets:
|
||||||
|
# PROD_HOST — prod server IP or hostname
|
||||||
|
# PROD_USER — SSH login user (typically root)
|
||||||
|
# PROD_SSH_KEY — private key whose public half is in authorized_keys
|
||||||
|
# PROD_SSH_KNOWN_HOSTS — output of: ssh-keyscan -H <PROD_HOST>
|
||||||
|
deploy:
|
||||||
|
name: Deploy to prod
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: [docker]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install SSH key
|
||||||
|
run: |
|
||||||
|
mkdir -p ~/.ssh
|
||||||
|
printf '%s\n' "${{ secrets.PROD_SSH_KEY }}" > ~/.ssh/deploy_key
|
||||||
|
chmod 600 ~/.ssh/deploy_key
|
||||||
|
printf '%s\n' "${{ secrets.PROD_SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
|
||||||
|
|
||||||
|
- name: Copy docker-compose.yml to prod
|
||||||
|
run: |
|
||||||
|
scp -i ~/.ssh/deploy_key \
|
||||||
|
docker-compose.yml \
|
||||||
|
"${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}:/opt/libnovel/docker-compose.yml"
|
||||||
|
|
||||||
|
- name: Pull new images and restart changed services
|
||||||
|
run: |
|
||||||
|
ssh -i ~/.ssh/deploy_key \
|
||||||
|
"${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}" \
|
||||||
|
'set -euo pipefail
|
||||||
|
cd /opt/libnovel
|
||||||
|
doppler run -- docker compose pull backend runner ui caddy pocketbase
|
||||||
|
doppler run -- docker compose up -d --remove-orphans'
|
||||||
|
|
||||||
# ── Gitea release ─────────────────────────────────────────────────────────────
|
# ── Gitea release ─────────────────────────────────────────────────────────────
|
||||||
release:
|
release:
|
||||||
|
|||||||
@@ -48,13 +48,11 @@ ENTRYPOINT ["/backend"]
|
|||||||
# On every `serve` startup it applies any pending migrations automatically.
|
# On every `serve` startup it applies any pending migrations automatically.
|
||||||
# Data is stored in /pb_data (mounted as a Docker volume in production).
|
# Data is stored in /pb_data (mounted as a Docker volume in production).
|
||||||
FROM alpine:3.21 AS pocketbase
|
FROM alpine:3.21 AS pocketbase
|
||||||
RUN apk add --no-cache ca-certificates && \
|
RUN apk add --no-cache ca-certificates wget
|
||||||
addgroup -S appgroup && adduser -S appuser -G appgroup
|
|
||||||
COPY --from=builder /out/pocketbase /pocketbase
|
COPY --from=builder /out/pocketbase /pocketbase
|
||||||
RUN mkdir -p /pb_data && chown appuser:appgroup /pb_data
|
RUN mkdir -p /pb_data
|
||||||
VOLUME /pb_data
|
VOLUME /pb_data
|
||||||
EXPOSE 8090
|
EXPOSE 8090
|
||||||
USER appuser
|
|
||||||
CMD ["/pocketbase", "serve", "--dir", "/pb_data", "--http", "0.0.0.0:8090"]
|
CMD ["/pocketbase", "serve", "--dir", "/pb_data", "--http", "0.0.0.0:8090"]
|
||||||
|
|
||||||
# ── runner service ───────────────────────────────────────────────────────────
|
# ── runner service ───────────────────────────────────────────────────────────
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ func saveIfAbsent(app core.App, c *core.Collection) error {
|
|||||||
if _, err := app.FindCollectionByNameOrId(c.Name); err == nil {
|
if _, err := app.FindCollectionByNameOrId(c.Name); err == nil {
|
||||||
return nil // already exists — skip
|
return nil // already exists — skip
|
||||||
}
|
}
|
||||||
return saveIfAbsent(app, c)
|
return app.Save(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Collection creators ───────────────────────────────────────────────────────
|
// ── Collection creators ───────────────────────────────────────────────────────
|
||||||
|
|||||||
96
docker-bake.hcl
Normal file
96
docker-bake.hcl
Normal file
@@ -0,0 +1,96 @@
|
|||||||
|
# docker-bake.hcl — defines all five production images.
|
||||||
|
#
|
||||||
|
# Used by CI (docker/bake-action) to build and push all images in one call,
|
||||||
|
# with shared BuildKit cache and maximum parallelism:
|
||||||
|
# - backend, runner, pocketbase share the Go builder stage (built once)
|
||||||
|
# - caddy and ui build independently in parallel alongside the Go targets
|
||||||
|
#
|
||||||
|
# Local build (no push):
|
||||||
|
# docker buildx bake
|
||||||
|
#
|
||||||
|
# CI sets per-target tags and labels via --set overrides in docker/bake-action.
|
||||||
|
|
||||||
|
# ── Variables injected by CI via --set ───────────────────────────────────────
|
||||||
|
|
||||||
|
variable "DOCKER_USER" { default = "kalekber" }
|
||||||
|
|
||||||
|
variable "VERSION" { default = "dev" }
|
||||||
|
variable "COMMIT" { default = "unknown" }
|
||||||
|
variable "BUILD_TIME" { default = "" }
|
||||||
|
|
||||||
|
# ── Shared defaults ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
# All targets inherit these. CI overrides tags/labels per-target via --set.
|
||||||
|
target "_defaults" {
|
||||||
|
pull = true
|
||||||
|
output = ["type=image,push=false"]
|
||||||
|
}
|
||||||
|
|
||||||
|
# Registry cache shared across all targets in a run.
|
||||||
|
target "_cache" {
|
||||||
|
cache-to = ["type=inline"]
|
||||||
|
}
|
||||||
|
|
||||||
|
# ── Go targets (share the backend/ build context + builder stage) ─────────────
|
||||||
|
|
||||||
|
target "backend" {
|
||||||
|
inherits = ["_defaults", "_cache"]
|
||||||
|
context = "backend"
|
||||||
|
target = "backend"
|
||||||
|
tags = ["${DOCKER_USER}/libnovel-backend:latest"]
|
||||||
|
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-backend:latest"]
|
||||||
|
args = {
|
||||||
|
VERSION = VERSION
|
||||||
|
COMMIT = COMMIT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
target "runner" {
|
||||||
|
inherits = ["_defaults", "_cache"]
|
||||||
|
context = "backend"
|
||||||
|
target = "runner"
|
||||||
|
tags = ["${DOCKER_USER}/libnovel-runner:latest"]
|
||||||
|
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-runner:latest"]
|
||||||
|
args = {
|
||||||
|
VERSION = VERSION
|
||||||
|
COMMIT = COMMIT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
target "pocketbase" {
|
||||||
|
inherits = ["_defaults", "_cache"]
|
||||||
|
context = "backend"
|
||||||
|
target = "pocketbase"
|
||||||
|
tags = ["${DOCKER_USER}/libnovel-pocketbase:latest"]
|
||||||
|
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-pocketbase:latest"]
|
||||||
|
}
|
||||||
|
|
||||||
|
# ── UI (SvelteKit — separate context) ────────────────────────────────────────
|
||||||
|
|
||||||
|
target "ui" {
|
||||||
|
inherits = ["_defaults", "_cache"]
|
||||||
|
context = "ui"
|
||||||
|
tags = ["${DOCKER_USER}/libnovel-ui:latest"]
|
||||||
|
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-ui:latest"]
|
||||||
|
args = {
|
||||||
|
BUILD_VERSION = VERSION
|
||||||
|
BUILD_COMMIT = COMMIT
|
||||||
|
BUILD_TIME = BUILD_TIME
|
||||||
|
PREBUILT = "1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# ── Caddy (custom plugins — separate context) ─────────────────────────────────
|
||||||
|
|
||||||
|
target "caddy" {
|
||||||
|
inherits = ["_defaults", "_cache"]
|
||||||
|
context = "caddy"
|
||||||
|
tags = ["${DOCKER_USER}/libnovel-caddy:latest"]
|
||||||
|
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-caddy:latest"]
|
||||||
|
}
|
||||||
|
|
||||||
|
# ── Default group: all five images ────────────────────────────────────────────
|
||||||
|
|
||||||
|
group "default" {
|
||||||
|
targets = ["backend", "runner", "pocketbase", "ui", "caddy"]
|
||||||
|
}
|
||||||
@@ -91,7 +91,8 @@ services:
|
|||||||
test: ["CMD", "wget", "-qO-", "http://localhost:8090/api/health"]
|
test: ["CMD", "wget", "-qO-", "http://localhost:8090/api/health"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 10
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
# ─── Meilisearch (full-text search) ──────────────────────────────────────────
|
# ─── Meilisearch (full-text search) ──────────────────────────────────────────
|
||||||
meilisearch:
|
meilisearch:
|
||||||
|
|||||||
2
justfile
2
justfile
@@ -63,7 +63,7 @@ build-push: build push
|
|||||||
|
|
||||||
# Pull all images from Docker Hub (uses GIT_TAG from Doppler)
|
# Pull all images from Docker Hub (uses GIT_TAG from Doppler)
|
||||||
pull-images:
|
pull-images:
|
||||||
{{doppler}} docker compose pull backend runner ui caddy
|
{{doppler}} docker compose pull backend runner ui caddy pocketbase
|
||||||
|
|
||||||
# Pull all third-party base images (minio, pocketbase, etc.)
|
# Pull all third-party base images (minio, pocketbase, etc.)
|
||||||
pull-infra:
|
pull-infra:
|
||||||
|
|||||||
Reference in New Issue
Block a user