ci: use version-bump action for semver tagging

.gitea/workflows/build.yml

@@ -6,8 +6,7 @@ on:
       - main
 
 env:
-  REGISTRY: git.sebse.de
+  CHART_PATH: web/charts/factorio-signal-exporter
-  IMAGE: git.sebse.de/sebse/factorio-signal-exporter
 
 jobs:
   build:
@@ -17,39 +16,49 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Log in to Gitea Container Registry
+      - name: Bump version
-        uses: docker/login-action@v3
+        id: version
+        uses: https://git.sebse.de/sebse/actions/version-bump@main
+        with:
+          token: ${{ github.token }}
+
+      - name: Set env vars
+        run: |
+          echo "IMAGE=git.sebse.de/${{ github.repository }}" >> $GITHUB_ENV
+          echo "IMAGE_MIGRATE=git.sebse.de/${{ github.repository }}-migrate" >> $GITHUB_ENV
+
+      - name: Docker login
+        uses: https://git.sebse.de/sebse/actions/docker-login@main
         with:
-          registry: ${{ env.REGISTRY }}
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Extract metadata
+      - name: Build and push app
-        id: meta
+        uses: https://git.sebse.de/sebse/actions/docker-build-push@main
-        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.IMAGE }}
+          image: ${{ env.IMAGE }}
-          tags: |
+          build-context: ./web
-            type=sha,prefix=,format=short
-            type=raw,value=latest
 
-      - name: Build and push
+      - name: Build and push migrate
-        uses: docker/build-push-action@v5
+        uses: https://git.sebse.de/sebse/actions/docker-build-push@main
         with:
-          context: ./web
+          image: ${{ env.IMAGE_MIGRATE }}
-          push: true
+          build-context: ./web
-          tags: ${{ steps.meta.outputs.tags }}
+          dockerfile: ./web/Dockerfile.migrate
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.IMAGE }}:latest
-          cache-to: type=inline
 
-      - name: Package Helm chart
+      - name: Package and push helm chart
-        run: helm package web/charts/factorio-signal-exporter
+        uses: https://git.sebse.de/sebse/actions/helm-package-push@main
+        with:
+          chart-path: ${{ env.CHART_PATH }}
+          version: ${{ steps.version.outputs.version }}
+          app-version: ${{ steps.version.outputs.version }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Push Helm chart to Gitea
+      - name: Deploy to prod
-        run: |
+        uses: https://git.sebse.de/sebse/actions/helm-deploy@main
-          curl -u ${{ secrets.GITEA_USERNAME }}:${{ secrets.GITEA_TOKEN }} \
+        with:
-            -X POST \
+          app: factorio-signal-exporter
-            https://${{ env.REGISTRY }}/api/packages/sebse/helm/api/charts \
+          profile: prod
-            -F "chart=@factorio-signal-exporter-0.1.0.tgz" \
+          version: ${{ steps.version.outputs.version }}
-            --fail-with-body
+          ssh-key: ${{ secrets.HELMBOT_SSH_KEY }}

web/Dockerfile.migrate

@@ -0,0 +1,10 @@
+FROM node:24-alpine
+
+WORKDIR /app
+
+COPY package.json package-lock.json* ./
+RUN npm ci
+
+COPY migrations/ ./migrations/
+
+CMD ["npm", "run", "migrate"]

web/charts/factorio-signal-exporter/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: factorio-signal-exporter
 description: Factorio Signal Exporter — Next.js dashboard with TimescaleDB
 type: application
-version: 0.1.0
+version: 0.0.0-dev
 appVersion: "latest"

web/charts/factorio-signal-exporter/templates/db-statefulset.yaml

@@ -26,12 +26,6 @@ spec:
           env:
             - name: POSTGRES_USER
               value: {{ .Values.db.user | quote }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "factorio-signal-exporter.secretName" . }}
-                  key: DATABASE_URL
-                  optional: false
             - name: POSTGRES_PASSWORD
               value: {{ .Values.db.password | quote }}
             - name: POSTGRES_DB

web/charts/factorio-signal-exporter/templates/deployment.yaml

@@ -9,10 +9,13 @@ spec:
   selector:
     matchLabels:
       {{- include "factorio-signal-exporter.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: app
   template:
     metadata:
       labels:
         {{- include "factorio-signal-exporter.selectorLabels" . | nindent 8 }}
+        app.kubernetes.io/component: app
+        app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -20,9 +23,8 @@ spec:
       {{- end }}
       initContainers:
         - name: migrate
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.initImage.pullPolicy }}
-          command: ["npm", "run", "migrate"]
           env:
             - name: DATABASE_URL
               valueFrom:

web/charts/factorio-signal-exporter/templates/service.yaml

@@ -8,6 +8,7 @@ spec:
   type: {{ .Values.service.type }}
   selector:
     {{- include "factorio-signal-exporter.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: app
   ports:
     - port: {{ .Values.service.port }}
       targetPort: 3000

web/charts/factorio-signal-exporter/values.yaml

@@ -1,7 +1,12 @@
 image:
   repository: git.sebse.de/sebse/factorio-signal-exporter
   tag: latest
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
+
+initImage:
+  repository: git.sebse.de/sebse/factorio-signal-exporter-migrate
+  tag: latest
+  pullPolicy: Always
 
 imagePullSecrets: []
 
@@ -20,7 +25,7 @@ db:
   name: factorio
   port: 5432
   storage: 10Gi
-  storageClassName: ""  # leave empty for cluster default
+  storageClassName: ""
 
 service:
   type: ClusterIP