From 574115cb716e7479b700ddd1e54ac13cc9a6b7f6 Mon Sep 17 00:00:00 2001
From: funman300 <funman300@gmail.com>
Date: Wed, 13 May 2026 21:51:52 -0700
Subject: [PATCH] fix(deploy): switch matomo to official image 5.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bitnami/matomo was removed from Docker Hub (0 tags). Switch to the
official matomo:5.10.0 image; update port 8080→80, volume path to
/var/www/html, and env var names to match the official image schema.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 deploy/matomo-deployment.yaml | 35 ++++++++++-------------------------
 deploy/matomo-service.yaml    |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/deploy/matomo-deployment.yaml b/deploy/matomo-deployment.yaml
index 6247d5e..6707331 100644
--- a/deploy/matomo-deployment.yaml
+++ b/deploy/matomo-deployment.yaml
@@ -17,18 +17,20 @@ spec:
     spec:
       containers:
         - name: matomo
-          image: bitnami/matomo:5
+          image: matomo:5.10.0
           env:
             - name: MATOMO_DATABASE_HOST
               value: mariadb
-            - name: MATOMO_DATABASE_PORT_NUMBER
+            - name: MATOMO_DATABASE_PORT
               value: "3306"
-            - name: MATOMO_DATABASE_NAME
+            - name: MATOMO_DATABASE_ADAPTER
+              value: PDO\MYSQL
+            - name: MATOMO_DATABASE_DBNAME
               valueFrom:
                 secretKeyRef:
                   name: matomo-secret
                   key: MYSQL_DATABASE
-            - name: MATOMO_DATABASE_USER
+            - name: MATOMO_DATABASE_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: matomo-secret
@@ -38,38 +40,21 @@ spec:
                 secretKeyRef:
                   name: matomo-secret
                   key: MYSQL_PASSWORD
-            - name: MATOMO_USERNAME
-              value: admin
-            - name: MATOMO_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: matomo-secret
-                  key: MATOMO_ADMIN_PASSWORD
-            - name: MATOMO_EMAIL
-              value: funman300@gmail.com
-            - name: MATOMO_WEBSITE_NAME
-              value: "Solitaire Quest"
-            - name: MATOMO_WEBSITE_HOST
-              value: "https://klondike.aleshym.co"
-            - name: MATOMO_HOST
-              value: analytics.aleshym.co
-            - name: MATOMO_ENABLE_PROXY_URI_HEADER
-              value: "yes"
           ports:
-            - containerPort: 8080
+            - containerPort: 80
           volumeMounts:
             - name: matomo-data
-              mountPath: /bitnami/matomo
+              mountPath: /var/www/html
           livenessProbe:
             httpGet:
               path: /index.php
-              port: 8080
+              port: 80
             initialDelaySeconds: 60
             periodSeconds: 30
           readinessProbe:
             httpGet:
               path: /index.php
-              port: 8080
+              port: 80
             initialDelaySeconds: 30
             periodSeconds: 10
           resources:
diff --git a/deploy/matomo-service.yaml b/deploy/matomo-service.yaml
index c6fc0b0..1825535 100644
--- a/deploy/matomo-service.yaml
+++ b/deploy/matomo-service.yaml
@@ -9,4 +9,4 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 8080
+      targetPort: 80