feat: tag Docker images with semver alongside SHA and latest

- Add factorio-mod-push step to build.yml (mod-folder: ./plugin)
- Create plugin/README.md as bootstrap for mod portal description

.gitea/workflows/build.yml

@@ -1,13 +1,13 @@
 name: Build & Push
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
 
 env:
-  REGISTRY: git.sebse.de
+  CHART_PATH: web/charts/factorio-signal-exporter
-  IMAGE: git.sebse.de/sebse/factorio-signal-exporter
 
 jobs:
   build:
@@ -17,14 +17,24 @@ 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@v1
+        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@v1
         with:
-          registry: ${{ env.REGISTRY }}
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Extract metadata
+      - name: Extract metadata (app)
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -32,24 +42,57 @@ jobs:
           tags: |
             type=sha,prefix=,format=short
             type=raw,value=latest
+            type=raw,value=${{ steps.version.outputs.version }}
 
-      - name: Build and push
+      - name: Build and push app
         uses: docker/build-push-action@v5
         with:
           context: ./web
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{ env.IMAGE }}:latest
           cache-to: type=inline
 
-      - name: Package Helm chart
+      - name: Extract metadata (migrate)
-        run: helm package web/charts/factorio-dashboard
+        id: meta-migrate
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_MIGRATE }}
+          tags: |
+            type=sha,prefix=,format=short
+            type=raw,value=latest
+            type=raw,value=${{ steps.version.outputs.version }}
 
-      - name: Push Helm chart to Gitea
+      - name: Build and push migrate
-        run: |
+        uses: docker/build-push-action@v5
-          curl -u ${{ secrets.GITEA_USERNAME }}:${{ secrets.GITEA_TOKEN }} \
+        with:
-            -X POST \
+          context: ./web
-            https://${{ env.REGISTRY }}/api/packages/sebse/helm/api/charts \
+          file: ./web/Dockerfile.migrate
-            -F "chart=@factorio-dashboard-0.1.0.tgz" \
+          push: true
-            --fail-with-body
+          tags: ${{ steps.meta-migrate.outputs.tags }}
+          cache-from: type=registry,ref=${{ env.IMAGE_MIGRATE }}:latest
+          cache-to: type=inline
+
+      - name: Package and push helm chart
+        uses: https://git.sebse.de/sebse/actions/helm-package-push@v1
+        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: Package and push Factorio mod
+        uses: https://git.sebse.de/sebse/actions/factorio-mod-push@v1
+        with:
+          mod-folder: ./plugin
+          version: ${{ steps.version.outputs.version }}
+          factorio-token: ${{ secrets.FACTORIO_TOKEN }}
+
+      - name: Deploy to prod
+        uses: https://git.sebse.de/sebse/actions/helm-deploy@v1
+        with:
+          app: factorio-signal-exporter
+          profile: prod
+          version: ${{ steps.version.outputs.version }}
+          ssh-key: ${{ secrets.HELMBOT_SSH_KEY }}

plugin/README.md

@@ -0,0 +1,3 @@
+# Signal Exporter
+
+Provides a custom combinator that reads both connected circuit and logistic networks, writing the data to a JSON file.

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-dashboard/templates/secret.yaml

@@ -1,12 +0,0 @@
-{{- if not .Values.app.existingSecret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}-secret
-  labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
-type: Opaque
-stringData:
-  API_TOKEN: {{ .Values.app.apiToken | required "app.apiToken is required" | quote }}
-  DATABASE_URL: {{ include "factorio-dashboard.databaseUrl" . | quote }}
-{{- end }}

web/charts/factorio-dashboard/templates/service.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}
-  labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    {{- include "factorio-dashboard.selectorLabels" . | nindent 4 }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: 3000

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

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: factorio-dashboard
+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/_helpers.tpl

@@ -1,23 +1,23 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "factorio-dashboard.name" -}}
+{{- define "factorio-signal-exporter.name" -}}
 {{- .Chart.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create a fully qualified app name.
 */}}
-{{- define "factorio-dashboard.fullname" -}}
+{{- define "factorio-signal-exporter.fullname" -}}
-{{- printf "%s" (include "factorio-dashboard.name" .) | trunc 63 | trimSuffix "-" }}
+{{- printf "%s" (include "factorio-signal-exporter.name" .) | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels.
 */}}
-{{- define "factorio-dashboard.labels" -}}
+{{- define "factorio-signal-exporter.labels" -}}
 helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-app.kubernetes.io/name: {{ include "factorio-dashboard.name" . }}
+app.kubernetes.io/name: {{ include "factorio-signal-exporter.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -26,25 +26,25 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels.
 */}}
-{{- define "factorio-dashboard.selectorLabels" -}}
+{{- define "factorio-signal-exporter.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "factorio-dashboard.name" . }}
+app.kubernetes.io/name: {{ include "factorio-signal-exporter.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Name of the secret that holds API_TOKEN and DATABASE_URL.
 */}}
-{{- define "factorio-dashboard.secretName" -}}
+{{- define "factorio-signal-exporter.secretName" -}}
 {{- if .Values.app.existingSecret }}
 {{- .Values.app.existingSecret }}
 {{- else }}
-{{- include "factorio-dashboard.fullname" . }}-secret
+{{- include "factorio-signal-exporter.fullname" . }}-secret
 {{- end }}
 {{- end }}
 
 {{/*
 Construct DATABASE_URL from db values.
 */}}
-{{- define "factorio-dashboard.databaseUrl" -}}
+{{- define "factorio-signal-exporter.databaseUrl" -}}
-{{- printf "postgresql://%s:%s@%s-db:%d/%s" .Values.db.user .Values.db.password (include "factorio-dashboard.fullname" .) (int .Values.db.port) .Values.db.name }}
+{{- printf "postgresql://%s:%s@%s-db:%d/%s" .Values.db.user .Values.db.password (include "factorio-signal-exporter.fullname" .) (int .Values.db.port) .Values.db.name }}
 {{- end }}

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

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}-db
+  name: {{ include "factorio-signal-exporter.fullname" . }}-db
   labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: db
 spec:
   clusterIP: None
   selector:
-    {{- include "factorio-dashboard.selectorLabels" . | nindent 4 }}
+    {{- include "factorio-signal-exporter.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: db
   ports:
     - port: {{ .Values.db.port }}

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

@@ -1,21 +1,21 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}-db
+  name: {{ include "factorio-signal-exporter.fullname" . }}-db
   labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: db
 spec:
-  serviceName: {{ include "factorio-dashboard.fullname" . }}-db
+  serviceName: {{ include "factorio-signal-exporter.fullname" . }}-db
   replicas: 1
   selector:
     matchLabels:
-      {{- include "factorio-dashboard.selectorLabels" . | nindent 6 }}
+      {{- include "factorio-signal-exporter.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: db
   template:
     metadata:
       labels:
-        {{- include "factorio-dashboard.selectorLabels" . | nindent 8 }}
+        {{- include "factorio-signal-exporter.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: db
     spec:
       containers:
@@ -26,12 +26,6 @@ spec:
           env:
             - name: POSTGRES_USER
               value: {{ .Values.db.user | quote }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "factorio-dashboard.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

@@ -1,18 +1,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}
+  name: {{ include "factorio-signal-exporter.fullname" . }}
   labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.app.replicaCount }}
   selector:
     matchLabels:
-      {{- include "factorio-dashboard.selectorLabels" . | nindent 6 }}
+      {{- include "factorio-signal-exporter.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: app
   template:
     metadata:
       labels:
-        {{- include "factorio-dashboard.selectorLabels" . | nindent 8 }}
+        {{- 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,14 +23,13 @@ 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:
                 secretKeyRef:
-                  name: {{ include "factorio-dashboard.secretName" . }}
+                  name: {{ include "factorio-signal-exporter.secretName" . }}
                   key: DATABASE_URL
       containers:
         - name: app
@@ -39,12 +41,12 @@ spec:
             - name: API_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "factorio-dashboard.secretName" . }}
+                  name: {{ include "factorio-signal-exporter.secretName" . }}
                   key: API_TOKEN
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "factorio-dashboard.secretName" . }}
+                  name: {{ include "factorio-signal-exporter.secretName" . }}
                   key: DATABASE_URL
           readinessProbe:
             httpGet:

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

@@ -2,9 +2,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "factorio-dashboard.fullname" . }}
+  name: {{ include "factorio-signal-exporter.fullname" . }}
   labels:
-    {{- include "factorio-dashboard.labels" . | nindent 4 }}
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -17,7 +17,7 @@ spec:
   tls:
     - hosts:
         - {{ .Values.ingress.host | quote }}
-      secretName: {{ .Values.ingress.tlsSecretName | default (printf "%s-tls" (include "factorio-dashboard.fullname" .)) | quote }}
+      secretName: {{ .Values.ingress.tlsSecretName | default (printf "%s-tls" (include "factorio-signal-exporter.fullname" .)) | quote }}
   {{- end }}
   rules:
     - host: {{ .Values.ingress.host | quote }}
@@ -27,7 +27,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ include "factorio-dashboard.fullname" . }}
+                name: {{ include "factorio-signal-exporter.fullname" . }}
                 port:
                   number: {{ .Values.service.port }}
 {{- end }}

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

@@ -0,0 +1,12 @@
+{{- if not .Values.app.existingSecret }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "factorio-signal-exporter.fullname" . }}-secret
+  labels:
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
+type: Opaque
+stringData:
+  API_TOKEN: {{ .Values.app.apiToken | required "app.apiToken is required" | quote }}
+  DATABASE_URL: {{ include "factorio-signal-exporter.databaseUrl" . | quote }}
+{{- end }}

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

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "factorio-signal-exporter.fullname" . }}
+  labels:
+    {{- include "factorio-signal-exporter.labels" . | nindent 4 }}
+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