Merge branch 'master' into feature/programmatic-seo

Previous build had localhost:8000 hardcoded.
This rebuild uses the fixed Dockerfile with build args.

.gitea/workflows/build.yaml

@@ -0,0 +1,68 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches: [master, main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Trigger BuildKit Build
+      run: |
+        kubectl delete job build-manoon-headless-action -n gitea --ignore-not-found=true 2>/dev/null || true
+        
+        cat << 'JOBEOF' | kubectl apply -f -
+        apiVersion: batch/v1
+        kind: Job
+        metadata:
+          name: build-manoon-headless-action
+          namespace: gitea
+        spec:
+          ttlSecondsAfterFinished: 86400
+          template:
+            spec:
+              restartPolicy: Never
+              initContainers:
+              - name: clone
+                image: alpine/git:latest
+                command: ["sh", "-c"]
+                args:
+                  - git clone --depth 1 http://gitea:3000/unchained/manoon-headless.git /workspace
+                volumeMounts:
+                - name: workspace
+                  mountPath: /workspace
+              containers:
+              - name: build
+                image: moby/buildkit:latest
+                command: ["sh", "-c"]
+                args:
+                  - |
+                    mkdir -p /root/.docker
+                    cp /docker-config/.dockerconfigjson /root/.docker/config.json
+                    buildctl --addr tcp://buildkit.gitea.svc.cluster.local:1234 build \
+                      --frontend dockerfile.v0 \
+                      --local context=/workspace \
+                      --local dockerfile=/workspace \
+                      --opt build-arg:NEXT_PUBLIC_SALEOR_API_URL=https://api.manoonoils.com/graphql/ \
+                      --opt build-arg:NEXT_PUBLIC_SITE_URL=https://manoonoils.com \
+                      --opt build-arg:NEXT_PUBLIC_OPENPANEL_CLIENT_ID=fa61f8ae-0b5d-4187-a9b1-5a04b0025674 \
+                      --opt build-arg:NEXT_PUBLIC_RYBBIT_HOST=https://rybbit.nodecrew.me \
+                      --opt build-arg:NEXT_PUBLIC_RYBBIT_SITE_ID=1 \
+                      --no-cache \
+                      --output type=image,name=ghcr.io/unchainedio/manoon-headless:latest,push=true
+                volumeMounts:
+                - name: workspace
+                  mountPath: /workspace
+                - name: docker-config
+                  mountPath: /docker-config
+                  readOnly: true
+              volumes:
+              - name: workspace
+                emptyDir: {}
+              - name: docker-config
+                secret:
+                  secretName: ghcr-pull-secret
+        JOBEOF
+        
+        echo "Build triggered!"

Dockerfile

@@ -1,17 +1,25 @@
-# Multi-stage build for Next.js
 FROM node:20-slim AS builder
 
 WORKDIR /app
 
-# Copy package files
+ARG NEXT_PUBLIC_SALEOR_API_URL
+ARG NEXT_PUBLIC_SITE_URL
+ARG NEXT_PUBLIC_OPENPANEL_CLIENT_ID
+ARG NEXT_PUBLIC_RYBBIT_HOST
+ARG NEXT_PUBLIC_RYBBIT_SITE_ID
+
+ENV NEXT_PUBLIC_SALEOR_API_URL=${NEXT_PUBLIC_SALEOR_API_URL}
+ENV NEXT_PUBLIC_SITE_URL=${NEXT_PUBLIC_SITE_URL}
+ENV NEXT_PUBLIC_OPENPANEL_CLIENT_ID=${NEXT_PUBLIC_OPENPANEL_CLIENT_ID}
+ENV NEXT_PUBLIC_RYBBIT_HOST=${NEXT_PUBLIC_RYBBIT_HOST}
+ENV NEXT_PUBLIC_RYBBIT_SITE_ID=${NEXT_PUBLIC_RYBBIT_SITE_ID}
+
 COPY package*.json ./
 RUN npm install --prefer-offline --no-audit
 
-# Copy source and build
 COPY . .
 RUN npm run build
 
-# Production stage
 FROM node:20-slim AS runner
 
 WORKDIR /app
@@ -20,7 +28,6 @@ ENV NODE_ENV=production
 ENV PORT=3000
 ENV HOSTNAME=0.0.0.0
 
-# Copy necessary files from builder
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/.next/standalone ./
 COPY --from=builder /app/.next/static ./.next/static

README.md

@@ -39,3 +39,6 @@ Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/bui
 // Auto-deploy test: 2026-03-07T09:02:49Z
 // Auto-deploy test: 2026-03-07T10:33:23Z
 // Auto-deploy test 2: 2026-03-07T10:37:05Z
+# Trigger build Sun Apr  5 06:32:05 AM EET 2026
+# Trigger build with env vars Sun Apr  5 08:45:00 AM EET 2026
+# Build test Sun Apr  5 12:59:49 PM EET 2026

k8s/deployment.yaml

@@ -13,102 +13,16 @@ spec:
       labels:
         app: storefront
     spec:
-      initContainers:
-      - name: clone
-        image: alpine/git:latest
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          apk add --no-cache git
-          git clone --depth 1 --branch master \
-            http://gitea.gitea.svc.cluster.local:3000/unchained/manoon-headless.git \
-            /workspace
-          echo "Clone complete."
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 500m
-            memory: 256Mi
-      - name: install
-        image: node:20-slim
-        workingDir: /workspace
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          echo "Installing dependencies..."
-          npm install --prefer-offline --no-audit 2>&1
-          echo "Dependencies installed."
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 3Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
-      - name: build
-        image: node:20-slim
-        workingDir: /workspace
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          echo "Building Next.js app..."
-          npm run build
-          echo "Build complete!"
-        env:
-        - name: NODE_ENV
-          value: "production"
-        - name: NEXT_PUBLIC_SALEOR_API_URL
-          value: "https://api.manoonoils.com/graphql/"
-        - name: NEXT_PUBLIC_SITE_URL
-          value: "https://manoonoils.com"
-        - name: DASHBOARD_URL
-          value: "https://dashboard.manoonoils.com"
-        - name: NEXT_PUBLIC_OPENPANEL_CLIENT_ID
-          value: "fa61f8ae-0b5d-4187-a9b1-5a04b0025674"
-        - name: OPENPANEL_CLIENT_SECRET
-          value: "91126be0d1e78e657e0427df82733832.c6d30edf6ee673da9650a883604169a13ab8579a0dde70cb39b477f4cf441f90"
-        - name: OPENPANEL_API_URL
-          value: "https://op.nodecrew.me/api"
-        - name: MAUTIC_CLIENT_ID
-          value: "2_23cgmaqef8kgg8oo4kggc0w4wccwoss8o8w48o8sc40cowgkkg"
-        - name: MAUTIC_CLIENT_SECRET
-          value: "4k8367ab306co48c4c8g8sco8cgcwwww044gwccs0o0c8w4gco"
-        - name: MAUTIC_API_URL
-          value: "https://mautic.nodecrew.me"
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 2Gi
-          requests:
-            cpu: 100m
-            memory: 512Mi
+      imagePullSecrets:
+      - name: ghcr-pull-secret
       containers:
       - name: storefront
-        image: node:20-slim
-        workingDir: /workspace
+        image: ghcr.io/unchainedio/manoon-headless:latest # {"": "flux-system:manoon-headless"}
+        imagePullPolicy: Always
         command:
-        - npm
-        - start
+        - node
+        - server.js
+        workingDir: /app
         ports:
         - containerPort: 3000
         env:
@@ -169,10 +83,3 @@ spec:
             port: 3000
           periodSeconds: 5
           failureThreshold: 3
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-      volumes:
-      - name: workspace
-        emptyDir:
-          sizeLimit: 2Gi

k8s/kustomization.yaml

@@ -5,6 +5,3 @@ resources:
   - service.yaml
   - middleware.yaml
   - ingress.yaml
-images:
-  - name: ghcr.io/unchainedio/manoon-headless
-    newTag: 2c27fc6  # Updated by GitHub Actions