Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d0dac256d | ||
|
|
8922111471 | ||
|
|
74e7c8e8d1 | ||
|
|
2f74b2b229 |
@@ -148,13 +148,9 @@ jobs:
|
||||
# SENTRY_PROJECT: ui
|
||||
|
||||
# ── docker: build + push all images via docker bake ──────────────────────────
|
||||
# docker-bake.hcl defines all five targets. BuildKit builds them with maximum
|
||||
# parallelism: backend/runner/pocketbase share the Go builder stage (compiled
|
||||
# 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-bake.hcl owns all tag logic (semver, major.minor, latest) via HCL
|
||||
# functions — no docker/metadata-action needed. BuildKit builds all five
|
||||
# targets in parallel, sharing the Go builder stage across backend/runner/pocketbase.
|
||||
docker:
|
||||
name: Docker
|
||||
runs-on: ubuntu-latest
|
||||
@@ -170,7 +166,14 @@ jobs:
|
||||
username: ${{ secrets.DOCKER_USER }}
|
||||
password: ${{ secrets.DOCKER_TOKEN }}
|
||||
|
||||
# ── Prepare ui build artifact ─────────────────────────────────────────────
|
||||
- name: Compute version tags
|
||||
id: ver
|
||||
run: |
|
||||
V="${{ gitea.ref_name }}"
|
||||
VER="${V#v}"
|
||||
echo "version=$VER" >> "$GITHUB_OUTPUT"
|
||||
echo "major_minor=$(echo "$VER" | cut -d. -f1-2)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Download ui build artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
@@ -182,80 +185,16 @@ jobs:
|
||||
grep -v '^build$' ui/.dockerignore > ui/.dockerignore.tmp
|
||||
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
|
||||
id: meta-ui
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ secrets.DOCKER_USER }}/libnovel-ui
|
||||
bake-target: ui
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=raw,value=latest
|
||||
|
||||
- name: Docker meta / caddy
|
||||
id: meta-caddy
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ secrets.DOCKER_USER }}/libnovel-caddy
|
||||
bake-target: caddy
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=raw,value=latest
|
||||
|
||||
# ── Build + push all images in parallel ───────────────────────────────────
|
||||
- name: Build and push all images
|
||||
uses: docker/bake-action@v6
|
||||
with:
|
||||
files: |
|
||||
docker-bake.hcl
|
||||
${{ steps.meta-backend.outputs.bake-file }}
|
||||
${{ steps.meta-runner.outputs.bake-file }}
|
||||
${{ steps.meta-pocketbase.outputs.bake-file }}
|
||||
${{ steps.meta-ui.outputs.bake-file }}
|
||||
${{ steps.meta-caddy.outputs.bake-file }}
|
||||
files: docker-bake.hcl
|
||||
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
|
||||
env:
|
||||
GIT_TAG: ${{ gitea.ref_name }}
|
||||
COMMIT: ${{ gitea.sha }}
|
||||
BUILD_TIME: ${{ gitea.event.head_commit.timestamp }}
|
||||
|
||||
# ── deploy: sync docker-compose.yml + restart prod ───────────────────────────
|
||||
# Runs after all images are pushed to Docker Hub.
|
||||
@@ -295,7 +234,7 @@ jobs:
|
||||
"${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}" \
|
||||
'set -euo pipefail
|
||||
cd /opt/libnovel
|
||||
doppler run -- docker compose pull
|
||||
doppler run -- docker compose pull backend runner ui caddy pocketbase
|
||||
doppler run -- docker compose up -d --remove-orphans'
|
||||
|
||||
# ── Gitea release ─────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -1,43 +1,40 @@
|
||||
# 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
|
||||
# Uses only plain variables for broad buildx compatibility (no locals/functions).
|
||||
# CI pre-computes VERSION and MAJOR_MINOR from the git tag and passes them as
|
||||
# env vars. Locally, everything gets a :dev tag.
|
||||
#
|
||||
# Local build (no push):
|
||||
# docker buildx bake
|
||||
#
|
||||
# CI sets per-target tags and labels via --set overrides in docker/bake-action.
|
||||
# CI passes: DOCKER_USER, VERSION, MAJOR_MINOR, COMMIT, BUILD_TIME
|
||||
|
||||
# ── Variables injected by CI via --set ───────────────────────────────────────
|
||||
|
||||
variable "DOCKER_USER" { default = "kalekber" }
|
||||
|
||||
variable "VERSION" { default = "dev" }
|
||||
variable "COMMIT" { default = "unknown" }
|
||||
variable "BUILD_TIME" { default = "" }
|
||||
variable "DOCKER_USER" { default = "kalekber" }
|
||||
variable "VERSION" { default = "dev" } # e.g. "4.1.6" (no leading v)
|
||||
variable "MAJOR_MINOR" { default = "dev" } # e.g. "4.1"
|
||||
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" {
|
||||
pull = true
|
||||
# CI overrides to push=true via --set *.output=type=image,push=true
|
||||
output = ["type=image,push=false"]
|
||||
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"]
|
||||
inherits = ["_defaults"]
|
||||
context = "backend"
|
||||
target = "backend"
|
||||
tags = [
|
||||
"${DOCKER_USER}/libnovel-backend:${VERSION}",
|
||||
"${DOCKER_USER}/libnovel-backend:${MAJOR_MINOR}",
|
||||
"${DOCKER_USER}/libnovel-backend:latest",
|
||||
]
|
||||
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-backend:latest"]
|
||||
args = {
|
||||
VERSION = VERSION
|
||||
@@ -46,10 +43,14 @@ target "backend" {
|
||||
}
|
||||
|
||||
target "runner" {
|
||||
inherits = ["_defaults", "_cache"]
|
||||
context = "backend"
|
||||
target = "runner"
|
||||
tags = ["${DOCKER_USER}/libnovel-runner:latest"]
|
||||
inherits = ["_defaults"]
|
||||
context = "backend"
|
||||
target = "runner"
|
||||
tags = [
|
||||
"${DOCKER_USER}/libnovel-runner:${VERSION}",
|
||||
"${DOCKER_USER}/libnovel-runner:${MAJOR_MINOR}",
|
||||
"${DOCKER_USER}/libnovel-runner:latest",
|
||||
]
|
||||
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-runner:latest"]
|
||||
args = {
|
||||
VERSION = VERSION
|
||||
@@ -58,19 +59,27 @@ target "runner" {
|
||||
}
|
||||
|
||||
target "pocketbase" {
|
||||
inherits = ["_defaults", "_cache"]
|
||||
context = "backend"
|
||||
target = "pocketbase"
|
||||
tags = ["${DOCKER_USER}/libnovel-pocketbase:latest"]
|
||||
inherits = ["_defaults"]
|
||||
context = "backend"
|
||||
target = "pocketbase"
|
||||
tags = [
|
||||
"${DOCKER_USER}/libnovel-pocketbase:${VERSION}",
|
||||
"${DOCKER_USER}/libnovel-pocketbase:${MAJOR_MINOR}",
|
||||
"${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"]
|
||||
inherits = ["_defaults"]
|
||||
context = "ui"
|
||||
tags = [
|
||||
"${DOCKER_USER}/libnovel-ui:${VERSION}",
|
||||
"${DOCKER_USER}/libnovel-ui:${MAJOR_MINOR}",
|
||||
"${DOCKER_USER}/libnovel-ui:latest",
|
||||
]
|
||||
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-ui:latest"]
|
||||
args = {
|
||||
BUILD_VERSION = VERSION
|
||||
@@ -83,9 +92,13 @@ target "ui" {
|
||||
# ── Caddy (custom plugins — separate context) ─────────────────────────────────
|
||||
|
||||
target "caddy" {
|
||||
inherits = ["_defaults", "_cache"]
|
||||
context = "caddy"
|
||||
tags = ["${DOCKER_USER}/libnovel-caddy:latest"]
|
||||
inherits = ["_defaults"]
|
||||
context = "caddy"
|
||||
tags = [
|
||||
"${DOCKER_USER}/libnovel-caddy:${VERSION}",
|
||||
"${DOCKER_USER}/libnovel-caddy:${MAJOR_MINOR}",
|
||||
"${DOCKER_USER}/libnovel-caddy:latest",
|
||||
]
|
||||
cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-caddy:latest"]
|
||||
}
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ services:
|
||||
|
||||
# ─── Meilisearch (full-text search) ──────────────────────────────────────────
|
||||
meilisearch:
|
||||
image: getmeili/meilisearch:latest
|
||||
image: getmeili/meilisearch:v1.40.0
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
MEILI_MASTER_KEY: "${MEILI_MASTER_KEY}"
|
||||
|
||||
2
justfile
2
justfile
@@ -63,7 +63,7 @@ build-push: build push
|
||||
|
||||
# Pull all images from Docker Hub (uses GIT_TAG from Doppler)
|
||||
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-infra:
|
||||
|
||||
Reference in New Issue
Block a user