chore: move tag logic into bake file, drop all metadata-action steps

docker-bake.hcl now owns semver tag generation via HCL locals + a reusable
img_tags() function: GIT_TAG="v4.1.5" → :4.1.5, :4.1, :latest on all images.
The Docker job shrinks from 13 steps to 6 — no docker/metadata-action needed.

CI simply passes GIT_TAG, COMMIT, BUILD_TIME as env vars to bake-action.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitea/workflows/ci.yaml

@@ -41,6 +41,9 @@ jobs:
       - name: Build healthcheck
         run: go build -o /dev/null ./cmd/healthcheck
 
+      - name: Build pocketbase
+        run: go build -o /dev/null ./cmd/pocketbase
+
       - name: Run tests
         run: go test -short -race -count=1 -timeout=60s ./...
 

.gitea/workflows/release.yaml

@@ -147,10 +147,10 @@ jobs:
   #         SENTRY_ORG: libnovel
   #         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 owns all tag logic (semver, major.minor, latest) via HCL
-  # Hub only needs to be authenticated once. This also eliminates 3 redundant
+  # functions — no docker/metadata-action needed.  BuildKit builds all five
-  # checkout + setup-buildx + scheduler round-trips compared to separate jobs.
+  # targets in parallel, sharing the Go builder stage across backend/runner/pocketbase.
   docker:
     name: Docker
     runs-on: ubuntu-latest
@@ -160,65 +160,12 @@ jobs:
 
       - 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
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
-      # ── backend ──────────────────────────────────────────────────────────────
-      - 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
         uses: actions/download-artifact@v3
         with:
@@ -230,51 +177,57 @@ jobs:
           grep -v '^build$' ui/.dockerignore > ui/.dockerignore.tmp
           mv ui/.dockerignore.tmp ui/.dockerignore
 
-      - name: Docker meta / ui
+      - name: Build and push all images
-        id: meta-ui
+        uses: docker/bake-action@v6
-        uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.DOCKER_USER }}/libnovel-ui
+          files: docker-bake.hcl
-          tags: |
+          set: |
-            type=semver,pattern={{version}}
+            *.output=type=image,push=true
-            type=semver,pattern={{major}}.{{minor}}
+        env:
-            type=raw,value=latest
+          GIT_TAG: ${{ gitea.ref_name }}
+          COMMIT: ${{ gitea.sha }}
+          BUILD_TIME: ${{ gitea.event.head_commit.timestamp }}
 
-      - name: Build and push / ui
+  # ── deploy: sync docker-compose.yml + restart prod ───────────────────────────
-        uses: docker/build-push-action@v6
+  # Runs after all images are pushed to Docker Hub.
-        with:
+  # Copies the compose file from the tagged commit to the server, pulls the new
-          context: ui
+  # images, and restarts only the services whose image or config changed.
-          push: true
+  # --remove-orphans cleans up containers no longer defined in the compose file
-          tags: ${{ steps.meta-ui.outputs.tags }}
+  # (e.g. the now-removed pb-init container).
-          labels: ${{ steps.meta-ui.outputs.labels }}
+  #
-          build-args: |
+  # Required Gitea secrets:
-            BUILD_VERSION=${{ steps.meta-ui.outputs.version }}
+  #   PROD_HOST             — prod server IP or hostname
-            BUILD_COMMIT=${{ gitea.sha }}
+  #   PROD_USER             — SSH login user (typically root)
-            BUILD_TIME=${{ gitea.event.head_commit.timestamp }}
+  #   PROD_SSH_KEY          — private key whose public half is in authorized_keys
-            PREBUILT=1
+  #   PROD_SSH_KNOWN_HOSTS  — output of: ssh-keyscan -H <PROD_HOST>
-          cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-ui:latest
+  deploy:
-          cache-to: type=inline
+    name: Deploy to prod
+    runs-on: ubuntu-latest
+    needs: [docker]
+    steps:
+      - uses: actions/checkout@v4
 
-      # ── caddy ────────────────────────────────────────────────────────────────
+      - name: Install SSH key
-      - name: Docker meta / caddy
+        run: |
-        id: meta-caddy
+          mkdir -p ~/.ssh
-        uses: docker/metadata-action@v5
+          printf '%s\n' "${{ secrets.PROD_SSH_KEY }}" > ~/.ssh/deploy_key
-        with:
+          chmod 600 ~/.ssh/deploy_key
-          images: ${{ secrets.DOCKER_USER }}/libnovel-caddy
+          printf '%s\n' "${{ secrets.PROD_SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest
 
-      - name: Build and push / caddy
+      - name: Copy docker-compose.yml to prod
-        uses: docker/build-push-action@v6
+        run: |
-        with:
+          scp -i ~/.ssh/deploy_key \
-          context: caddy
+            docker-compose.yml \
-          push: true
+            "${{ secrets.PROD_USER }}@${{ secrets.PROD_HOST }}:/opt/libnovel/docker-compose.yml"
-          tags: ${{ steps.meta-caddy.outputs.tags }}
+
-          labels: ${{ steps.meta-caddy.outputs.labels }}
+      - name: Pull new images and restart changed services
-          cache-from: type=registry,ref=${{ secrets.DOCKER_USER }}/libnovel-caddy:latest
+        run: |
-          cache-to: type=inline
+          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 ─────────────────────────────────────────────────────────────
   release:

backend/Dockerfile

@@ -48,13 +48,11 @@ ENTRYPOINT ["/backend"]
 # On every `serve` startup it applies any pending migrations automatically.
 # Data is stored in /pb_data (mounted as a Docker volume in production).
 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
-RUN mkdir -p /pb_data && chown appuser:appgroup /pb_data
+RUN mkdir -p /pb_data
 VOLUME /pb_data
 EXPOSE 8090
-USER appuser
 CMD ["/pocketbase", "serve", "--dir", "/pb_data", "--http", "0.0.0.0:8090"]
 
 # ── runner service ───────────────────────────────────────────────────────────

backend/migrations/20260414000001_initial_schema.go

@@ -81,7 +81,7 @@ func saveIfAbsent(app core.App, c *core.Collection) error {
 	if _, err := app.FindCollectionByNameOrId(c.Name); err == nil {
 		return nil // already exists — skip
 	}
-	return saveIfAbsent(app, c)
+	return app.Save(c)
 }
 
 // ── Collection creators ───────────────────────────────────────────────────────

docker-bake.hcl

@@ -0,0 +1,120 @@
+# 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 (push=false by default):
+#   docker buildx bake
+#
+# CI passes GIT_TAG (e.g. "v4.1.3") and the bake file computes all three tag
+# variants (full semver, major.minor, latest) — no docker/metadata-action needed.
+
+# ── Variables injected by CI ──────────────────────────────────────────────────
+
+variable "DOCKER_USER" { default = "kalekber" }
+
+# Full git tag, e.g. "v4.1.3".  CI passes this via --set or env.
+# Locally defaults to "dev" so images get a :dev tag.
+variable "GIT_TAG" { default = "dev" }
+
+variable "COMMIT"     { default = "unknown" }
+variable "BUILD_TIME" { default = "" }
+
+# ── Tag helpers ───────────────────────────────────────────────────────────────
+
+locals {
+  # Strip leading "v": "v4.1.3" → "4.1.3"
+  version = trimprefix(GIT_TAG, "v")
+
+  # major.minor only: "4.1.3" → "4.1"
+  major_minor = join(".", slice(split(".", local.version), 0, 2))
+
+  # true when building a real release tag (not local "dev" build)
+  is_release = GIT_TAG != "dev"
+}
+
+# Return the three standard tags for a given image repo.
+# Always includes :latest and the full version; skips major.minor for dev builds.
+function "img_tags" {
+  params = [repo]
+  result = local.is_release ? [
+    "${repo}:${local.version}",
+    "${repo}:${local.major_minor}",
+    "${repo}:latest",
+  ] : ["${repo}:dev"]
+}
+
+# ── Shared defaults ───────────────────────────────────────────────────────────
+
+target "_defaults" {
+  pull     = true
+  # CI overrides this 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"]
+  context    = "backend"
+  target     = "backend"
+  tags       = img_tags("${DOCKER_USER}/libnovel-backend")
+  cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-backend:latest"]
+  args = {
+    VERSION = local.version
+    COMMIT  = COMMIT
+  }
+}
+
+target "runner" {
+  inherits   = ["_defaults"]
+  context    = "backend"
+  target     = "runner"
+  tags       = img_tags("${DOCKER_USER}/libnovel-runner")
+  cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-runner:latest"]
+  args = {
+    VERSION = local.version
+    COMMIT  = COMMIT
+  }
+}
+
+target "pocketbase" {
+  inherits   = ["_defaults"]
+  context    = "backend"
+  target     = "pocketbase"
+  tags       = img_tags("${DOCKER_USER}/libnovel-pocketbase")
+  cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-pocketbase:latest"]
+}
+
+# ── UI (SvelteKit — separate context) ────────────────────────────────────────
+
+target "ui" {
+  inherits   = ["_defaults"]
+  context    = "ui"
+  tags       = img_tags("${DOCKER_USER}/libnovel-ui")
+  cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-ui:latest"]
+  args = {
+    BUILD_VERSION = local.version
+    BUILD_COMMIT  = COMMIT
+    BUILD_TIME    = BUILD_TIME
+    PREBUILT      = "1"
+  }
+}
+
+# ── Caddy (custom plugins — separate context) ─────────────────────────────────
+
+target "caddy" {
+  inherits   = ["_defaults"]
+  context    = "caddy"
+  tags       = img_tags("${DOCKER_USER}/libnovel-caddy")
+  cache-from = ["type=registry,ref=${DOCKER_USER}/libnovel-caddy:latest"]
+}
+
+# ── Default group: all five images ────────────────────────────────────────────
+
+group "default" {
+  targets = ["backend", "runner", "pocketbase", "ui", "caddy"]
+}

docker-compose.yml

@@ -91,7 +91,8 @@ services:
       test: ["CMD", "wget", "-qO-", "http://localhost:8090/api/health"]
       interval: 10s
       timeout: 5s
-      retries: 5
+      retries: 10
+      start_period: 30s
 
   # ─── Meilisearch (full-text search) ──────────────────────────────────────────
   meilisearch:

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: