~ UPD update all dependencies

.lando.yml

@@ -1,12 +1,11 @@
 name: blog
 proxy:
   appserver_nginx:
-    - blog.hvgdev.website
+  - blog.hvgdev.website
-  mailhog:
+
-    - mailhog.hvgdev.website
 recipe: wordpress
 config:
-  php: "8.4"
+  php: '8.3'
   via: nginx
   database: mariadb
   webroot: web

Brewfile

@@ -2,6 +2,6 @@ brew "editorconfig-checker"
 brew "composer"
 brew "wp-cli"
 tap "shivammathur/php"
-brew "php@8.4"
+brew "php@8.3"
 brew "php-code-sniffer"
 vscode "Command is only available in WSL or inside a Visual Studio Code terminal."

composer.json

@@ -48,7 +48,7 @@
     }
   ],
   "require": {
-    "php": ">=7.4 <8.5",
+    "php": ">=7.4 <8.4",
     "ext-gd": "*",
     "ext-redis": "*",
     "ext-mbstring": "*",
@@ -61,11 +61,11 @@
     "oscarotero/env": "^2.1",
     "roots/bedrock-autoloader": "^1.0",
     "roots/bedrock-disallow-indexing": "^2.0",
-    "roots/wordpress": "^6.9",
+    "roots/wordpress": "^6.8.1",
     "roots/wp-config": "^1.0.0",
-    "wpackagist-theme/twentytwentyfive": "^1.0",
     "humanmade/s3-uploads": "^3.0",
     "hvg-dev/hvg-blog-general": "dev-main",
+    "wpackagist-theme/twentytwentyfive": "^1.0",
     "wpackagist-plugin/disable-wordpress-updates": "^1.8",
     "wpackagist-plugin/disable-comments": "^2.5",
     "wpackagist-plugin/wp-webhooks": "^3.3",

k8s/manifests/app/templates/7-wp-deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     app: {{ .Release.Name }}
 spec:
   replicas: 1
-  # revisionHistoryLimit: 3
+# revisionHistoryLimit: 3
   selector:
     matchLabels:
       app: {{ .Release.Name }}
@@ -17,28 +17,28 @@ spec:
         app: {{ .Release.Name }}
     spec:
       imagePullSecrets:
-        - name: github-container-registry
+      - name: github-container-registry
       containers:
-        - name: {{ .Release.Name }}
+      - name: {{ .Release.Name }}
-          image: {{ .Values.image }}
+        image: {{ .Values.image }}
-          imagePullPolicy: Always
+        imagePullPolicy: Always
-          command:
+        command:
-            - {{ .Values.command | default "web" | quote }}
+        - {{ .Values.command | default "web" | quote }}
-          resources:
+        resources:
-            requests:
+          requests:
-              memory: 128M
+            memory: 128M
-              cpu: 100m
+            cpu: 100m
-            limits:
+          limits:
-              memory: 512M
+            memory: 512M
-          ports:
+        ports:
-            - containerPort: {{ .Values.env.PORT | default 5000 }}
+        - containerPort: 5000
-          envFrom:
+        envFrom:
-            - configMapRef:
+        - configMapRef:
-                name: {{ .Release.Name }}
+            name: {{ .Release.Name }}
-            - secretRef:
+        - secretRef:
-                name: {{ .Release.Name }}
+            name: {{ .Release.Name }}
-            - secretRef:
+        - secretRef:
-                name: "{{ .Release.Name }}-db-connection"
+            name: "{{ .Release.Name }}-db-connection"
 ---
 apiVersion: v1
 kind: Service
@@ -49,7 +49,7 @@ spec:
   selector:
     app: {{ .Release.Name }}
   ports:
-    - name: wp
+  - name: wp
-      protocol: TCP
+    protocol: TCP
-      port: {{ .Values.env.PORT | default 5000 }}
+    port: 5000
-      targetPort: {{ .Values.env.PORT | default 5000 }}
+    targetPort: 5000

k8s/manifests/app/templates/8-ingress.yaml

@@ -6,17 +6,17 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Values.host }}
+  - host: {{ .Values.host }}
-      http:
+    http:
-        paths:
+      paths:
-          - backend:
+      - backend:
-              service:
+          service:
-                name: {{ .Release.Name }}
+            name: {{ .Release.Name }}
-                port:
+            port:
-                  number: {{ .Values.env.PORT | default 5000 }}
+              number: 5000
-            path: /
+        path: /
-            pathType: Prefix
+        pathType: Prefix
   tls:
-    - hosts:
+  - hosts:
-        - {{ .Values.host }}
+    - {{ .Values.host }}
-      secretName: "{{ .Release.Name }}-tls"
+    secretName: "{{ .Release.Name }}-tls"

k8s/manifests/app/values.yaml

@@ -1,4 +1,4 @@
-image: ghcr.io/hvg-dev/blog:main
+image: ghcr.io/hvg-dev/blog:dev
 
 # Image pull secret for the container registry (see https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-create-imagepullsecrets)
 imagePullSealedSecret: AgA56Wy8PD6cByq+xIFwOBl0OUPt0ricOB0tjaC+B/mpHhFnsKaGKt4EdUsfnDZccc3IdpoIFdhOo3rkAikxN+PjCFpb/bC0JZZiP8K3DAREizLAU1R0og0xWjOGZ+GHRdZMiuNFf3ADl5D65lrIr1e1wTrSuJ8SReOqo2rY9QGDwWC51iJwy0cmB3WVGDYjDUIz/vnx5p8BxzIEHsCIoSelBIQjJ0idZwe8JuaSxrQRUtk8/Cenj3mUVsXIVpNr4ExBMF4tBuYEAYuY1t98bp66l6dbbEfnLDpQXDusj7RITV0N2KQ++7h5fjlH9yC8nsXntZb4T6oVSZlJWUYDzqaqfBFckQ6S0L9XcgSOFHKeZa1MVEiKpjiU9uEn+hDCPbatg5exMUEAcvXl6LxnKW/Mn0dIykOv/LIQyxXeUFdGOoFj6pCvkj/Z2DFeHLq5/+rY0ZIvLnLtGYfxm2Du1ft3MldWUSq9i4BUuL0ddH5h4PRxC5SE7Yp/SGkU4qDqqSmh21GxVdezp4YK9Mg4gRrCcGPL+sViDYkDLvBXOpBVhhQbAQcZWkDHit58p3nh2byP0GpIL0etnFGVqx9n2W2BuckKbOeEaRGbdaeO8pT6f2IOA6ZyuT91RiqRYrzXYMA2hzmQBVYlKXjI3LAuEHOnccl7cA57j32U+yHsaCHpxQ0vbDpoZHwRj7O3De4BlEdFiMIBcgveXMK8V5t6Hie/KQZOXwt38UPj9axdGoMzPFe5KffWHNJrUYVyHkS9lfKgi4aHF/SIs034x39l7KPitk3+UqFtKUEuL0/P+EoxN9qre/HFGvF3uZRdllt6gruWYLVCrnLnHfKRKe9D9Mb5jVi+BbVfxuXBip/TFnc0x3JRGmGQQm2bICyYonPP3pQcDqqq/8dshKCGeVHmsN8mP+ERv/izbb2QU4loRg==
@@ -15,13 +15,16 @@ db:
 
 env:
   PORT: 5000
+  BLOG_SLUG: dev
   DB_PREFIX: wp_
   WP_ENV: production
   DISABLE_WP_CRON: 1
   TZ: Europe/Budapest
   #GTM_CODE:
+  S3_UPLOADS_BUCKET: hvgblog/dev
+  S3_UPLOADS_BUCKET_URL: https://cdn.hvgblog.hu
   S3_UPLOADS_ENDPOINT: https://ams3.digitaloceanspaces.com
-  S3_UPLOADS_HTTP_CACHE_CONTROL: "30 * 24 * 60 * 60"
+  S3_UPLOADS_HTTP_CACHE_CONTROL: '30 * 24 * 60 * 60'
   S3_UPLOADS_REGION: eu-west-1
   SMTP_ENABLED: 1
   SMTP_PORT: 2525
@@ -31,9 +34,9 @@ env:
   SMTP_LOGIN: wp@mg.hvgblog.hu
 
 sealedSecretEnv:
-  S3_UPLOADS_KEY: AgDFe7dbKo/5MDvniH7GrsoIdLHpFE4cB5h9RwDxqCa7jQppBic95lT3kqNOFrewKfolGXGu8Zr2lJpw/Bq0XjSBuSCBTKruaxSJp3dOi34cCimjH7/GnFHdqkiqG39sBFX5MJoCV1odDBIWsMKiBsqNH/IV9A2QMawZUuvg0ei/e347HZ2Qo++2NM3FaxC4vR/jMlNjEEasQWtsvMr1MVEQWadhKCuGpAiimMS4Vi8aU65DVXF+6pv/tW/8eBxUfGiY3bWvER0geoFSwCYBpQEHWSjGv6ll1GRaG00JEn+qGF5t4/xsDjE8LPfcKxvg3+eQKhA4Ze8KMagv7jO2p0B46PYMYUTdUz1/7SNJtVBZn/Iw+HlXtTXM77rEJxC1zpVVTeE1Pvl0itSKr82cIIwUES0ULry2pS9v0Eu7TO8GcuqKZ1kY/Vjz3nKwBuCD8VjUpdFNhjWterpFMG8mGwMvTA7KrPAuz+UO1cnJILcmGA2gqxk5uOzUy85KAdof/rDgQwNMO4DEjAKnGqVeHp7DkWt6jO6HyzQiqgNUJs0COi/yS4UbRdlWvsxKj+EMeDXJWexndm6ypS7z2DCn8xQTz9C4xfpAAYOzTrDHlpjNNXU0bWS7VtsbB+UjNAbbEy16C+u/xTFAk8tL+yzHcJ+95foofzwX8mfq/r8B9sMAHF+qYro0NgE7Ey/3YNdpWpLf8qFAJImgSawj84lrvGkdGf6ClA==
+  S3_UPLOADS_KEY: AgASNFNBXB4SlrioskAAXTkVjpmDTFUVI88/qx0w9LMaW6Xqd2W1LZkwNqNStCeN1XbLX8KBypJ2SDz6jUaXUDFl3K98j4VGcxm7o06kGz6MQFDKPTv3tiSaqS8dJeQBB0pMIWRkbAQUkgRxR7SE5R8bkuKWg3RgvPfX6Po/8+D+vT47xi6Vk04VkCoTw8xiBZu6ZtwENm/57saMK/1n0o9uvEm3NWY/lN7G146wIrpHKqzefWddUK5ddDuJJQdUbQnkHPHC9pUH+6a+86ywBp6ZFg5Tzc7jkq9QryRRUjlh6+/fUHZm9B0IEKgdpKaX+fFVFg+xy6fO8CuV/80aJD12v/9+b6Wd9G2U+LSm1KYBFWoWFEiuW/qoA+WH60PYw0/czOxh6FXZgfcqFFLG1mNpzE0/0MsXrZZzS1pFhG8VCGBmTrDGq6gBCsYZtdY456L7fo/REbAHzJ3B5RATlfCTqrr33nNHX6MZod46vE/123dgeZ/Uaui9pjM9/AQko1KGnIAfmiYMilA+CIupXNr1CgIPlB6Gd8iUdg4Lyko0ahkRfu27O9mx4ATLz4b7YD0jXa9TY+LnyucsySTnSbRkjHIL0JePPMYjGP0+M9q+h5IwttRf2xVMqNkBXngqBOsNoBBWyoe2BfVCedX3wh5B/o9gSQbARNPYR03ZI4XeMiG4MbIwAGvXOm+/Ef3h1RtDq4+q4GtG/oH8UQFzxigr3Qcdt+M=
-  S3_UPLOADS_SECRET: AgBJZkFQVuH7a5aL14fVusWVlpecX2DCGy6QqZEfvH75ZJqTLzNsGNU0Xgcwvd3IuCUx5Z9D8TWDQ27MnBH/MEJVc05Yc7CW9/u+0/NPIWibx+tzYgr3uY2An4QhOqSydCk+583aGAo6grEnlxIphAy64bfUaXYLnpTrS9Ztno6enLciGzLXHqdlSiiWyTZSOIUqs8tuvs7GBTmcdQXjveNppw4gqz4ZXNsV0S9WVc3jO/PlObFQON4sBAycxm7FCDoIpYg9DuUGvXQXhNly6hMT8vt1OEStTQowvp7yXmTGGBKn8GkOhFZghYJNcpfjL1hjXbtxS5fitXXFF0tA1EbBCmDpkdfJ/Y/Tl8ZmSmOcJTJz9jwFdnPBM2IANtxBfH5G2jeG6ngj+m6F/o3n3LaXMdoRD7z/ej1IyxAVOkcqOSrYAB8awauKVeyG1CAB/RCHiuQIzy2DDNZ0yrr6Q19JfrCbiSkEzyRUoKqUUaUccXnhStgPvM0xiDYMXJykTv+1Za3B52bxI73YVLDzVN53Wd2sRy47WGfGVjoDtoKuv2uibZUpBS4hBNk0k+/ElvOO2ZEWrlEV/o5Y0tgU730Ke6WZCs3/C63olRqOeYlf6JXQAaIyZZHZ3QooG/gCc4kAQ21/ZnduG0w+a8ilhKMhhAOpCua5QOyoFPFZlEXrGKlW62RaxeR0/8LrmOUxdYFpUGVvt7iKnJEGT1aukF/fl6GAea72YKuJJq9jX7wfXDc1nrOxv0wi/vbN
+  S3_UPLOADS_SECRET: AgANZgOk9NWB7DGFPt0ovHX9ZjT4Sz4cqmx3/MveZORX6yuRaGPHapMnA3f0rgc90c3Z+2z9VlMgINsoJg11DLb/wTNnGcSIW/rmvIH7o+///qk94QbSvUp0kc6VgE7kEZhGU/nzsAd0Ak+8reEh17fNPH6yNf4TtkeICfi4onX64SxEcNmuIcpGTTBeJ300eKgKlTeTuGuN/+/cOn0VPj456nv6nlvag9eRfAcSy6Qo4t0gfvRTbML5zTXDGXArfCCWhMxtoos1KbD48WNlWU/t6d6bODNSaMMsjgIAgY3mkwrUGvuSQV5BAAU2eIgtvAFASXHVLThIt8gqaktappgCJQmLK2d922BYV/ifJMFjp6t0+dd4lsjSmDNQxKr2cjz9DLqdmcpJ3U/W+pKPefb5Na+iOOhzQXSsSTUV4J0pVjdXqnGILX+CSgs8aH+Ax1eLAciGIcajGV6C70GYhVIyMkvC9mmY+QboJBd5eidemIz73APP6yTuKFVO8zsn+CmQ+r65FhjNFzRYTcWpt8k000phtlJvRI9AJ0auhPpGe8rWEA5VcMwlfW0BFbfCT4lkEEirPXUvFhfRohu4Kl0CZkVvRHVhf0q9LU0MEPqjQDPf/xYLP7gVYTD5wYo5aZVCS4FXn3qY8ehucJCJT1X6XjZff2Ym2f4VHC21I3bjOOJrX7gPhAlITEoCcumzaOwWf7iBMQVBQkMo1uscsTZy3YG/OKi7B8Oy36QTMl1enSSX8U3XS/AoSdvSjQ==
-  SMTP_PASSWORD: AgDzPlfjaqC40ZsCZrWLS3ULJ9zfT8McPKbAjumrRaugSPR945MOCN/bpGnYJiIBa0A08bZE9oBgsEEA0eglVN7fEsg4hnPU/3MUZf8fbB2eRLBAx3hN8pRC9X7tXCnLRh/BHlFljtLCU3kxcQM3Ujqyg4/wzGUiaXb5TCeGu2U4Krx0lBx5NCrx1tOjRH4yQ0KXToBjvDTLd1Vd2V/zmY1o063mhLmUh/h5j8NnTyqVRgeUyD+QR+Br8wbmHZrtyGBnI2cP+x+8aRXQxvEMwz1PkVHRXYVpSJRg1wLYnUqi2fQHjsaq8X0vgd/SWmaNllKL2cinP2xXDRLEEI+MyCUFDjYm0rhKEFLxa5KNahZiZw4cj0nnr4cIhHHgKSc47p++M3UiL06cZpb8Adaq8Y+5A2QSjm4E/9SmL5xt3mBFNssK/Qo9OLXaUjzvxK3C4p6BnObPOlAVuWfY60ekSvoKn3mzjKSvkZLamgInr9lOxHirPPeYFJTkdm7VV3M29bJqrbMB5KJDCX1Wt/qNOPLmyImwxYDWoh0M/YoFDupAqLKuHti49un6W2ZBzFhaW5f1IauNMBpD7xlP0qUb6Qs4G2lO5iebl+Q2rPUG7uN61rLo1CPukU2c6DiMHgb0Ffr5s4m6urv/uIpLgFzagVruroGp2ASARIMMKGMXS8TblsJcZBTqumXiJ9Ae6gnkWNUrVY90V0qjvU1qhvkS7k9ZnH70sW1tU4wRMu4Lmeqx/zQcnUAEresPsKFwF4VcnryRCQ==
+  SMTP_PASSWORD: AgA9mg9AReuqS8mNJ+6nukExGUhoMYRxHp6Yyuz9otonkn/7BXobjXjF3W8M9y77OysxlJNjfmuCDiYYSQY4EG8c3/lhA5qeMI9vZHIoOI+B/07Ur8BF2jrMdAkjJx6AIVnqIpoU1zGKuE58L4BV/5+D8wRJiEMaVWKcG/5doy2DqjYLEAUAAalrzL8EXM1NTqGS4g3tMNprkcriNSQ3Flj1WBkCX5QEIWtgjAtUajF0tQJLGq0fOHOO4ERM44sMBTS/JcHoLOB22N7YDeTCl+RZwfQgycLThunMbnTtwxjYRELxprWuf9d1Xt+mQ74owU/WWUb5J8DO9gRoI5WHMfCU/TSFLn2C5d6n4J/MlbVElJ8DJDN1CG2dA2XqkiHvoyAbhv66J25d8Jgx69E8cA2zLgBs3SD4rKZ7l8Sqj/G83bAPwqOO6M/fmMtOaHYU7od1buBybesWoZXFRNXBjz5q7UUQkIV6qegMc5Mef2CkrD2NCwJVWsOJMJuWbyFoowMMlgEB/OYEcN5qVVKT9UoaeYXf0h9MA54sv2U/YqDkFxYzVnPe3JMVoRY2x7x+PVe3gzh3rFjSrqjN8MVbAtIGFVJLOZmhN69r2alsJxFsUo+uEFNETYlPPfnmbTiuZwc4cbSRXSSwbhX7zI0mBQhVpVts+2DT5hu3vmUFw9L7M2JClJcECW/mopSS1Ao2jzPHpCwQ3tc/Io4Daut5n4fMsdISEoFUy50cnHlOCu1O09hH0f+FRCEojrP50Ycs2xb//PE=
 
   ### WordPress Salts
   AUTH_KEY: AgCvDJbrBT/ze5NXqfrs4ZCjHkDj6uM19QVVomPy3mLkcDqBoRznD0heGbiWBLu6/kOcV18sw1q7WMwU//6cuU5eZmeYnhZHbNDxGDPE8Nw/UUmoOR9wOc/XozXf4DBK1zLn9ne4xA4lMdlYeJ7WBWPFYyoc0htrbEiB+MAEt8DXvlRooDIZYtitZzBHWrhFLuIhAi2mIA2SQ9V8simzbUU3DM7Wb/DY4Qoa4jP/XTEgcxdtQPzOXFJTlZt5poMqs1/ckrTeo1/9SLrZZTWQPeZlsoISs18J8oeK33ugTNYz51mRoOai0Yhnc2bbN+4WGgtXi6FPjPgFcdjKjul5gdb81Z47RIO8wwsPjnFTSQ1LXtSJ/HiX9uOj1OHUYEH1rIqzaOmxDo23VYParhDsU2QLDIf1S8mJo/WTn4Hb6IAA5Veb7bbudesffgxgMm69qTQrdoPumLaXNX6TnRC5tGM+YaYbBGVsuDxSZUnagEkobgG8D60V58c6mWbZ+k+VZ+0aNGyaLHEAjZDCDxh9/6AkOoqLIaUXOgL7hQ3eX2YAFfBdwIICY82ylC1DqwTxGqpjRP45E2tMHEp8IQHLgvdEChLBXmqPVk0kJF+FJIzdOE+OkLtnAmCD0L3eq2SXRoceISxf0UNVWLwXMYCrvOM2kSrDHT/PhCqtGwaIDWuLXdddXZzECPk5hcLJb+JSYG1yRc6Qc8nezag7hh31pvfFI6PtR4LqlI8xmsHz0RognxQi/MEI6uSJ23/w+4RbjlBBKILoLqkgE+v1mhbAUuMr0Q==

k8s/manifests/dev-application.yaml

@@ -1,43 +1,25 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: nyomorszele.hvgblog.hu
+  name: dev.hvgblog.hu
   namespace: hvg-dev
 spec:
   project: default
   source:
-    repoURL: "ssh://git@ssh.github.com:443/hvg-dev/blog.git"
+    repoURL: 'ssh://git@ssh.github.com:443/hvg-dev/blog.git'
     path: k8s/manifests/app
-    targetRevision: dev
+    targetRevision: HEAD
     helm:
       releaseName: hvgblog-dev-wp
-      parameters:
+      parameters: []
-        - name: host
-          value: nyomorszele.hvgblog.hu
-        - name: db.name
-          value: nyomorszele
-        - name: db.user
-          value: nyomorszele
-        # - name: env.DB_PREFIX
-        #   value: wp_
-        - name: env.BLOG_SLUG
-          value: nyomorszele
-        - name: env.S3_UPLOADS_BUCKET
-          value: hvgblog/nyomorszele
-        # - name: env.WP_DEBUG_LOG
-        #   value: /tmp/debug.log
-        - name: env.S3_UPLOADS_BUCKET_URL
-          value: https://hvgblog.ams3.cdn.digitaloceanspaces.com/nyomorszele
-        - name: image
-          value: ghcr.io/hvg-dev/blog:dev
       valueFiles: []
   destination:
-    server: "https://hvgblog-vcluster.hvg.hu"
+    server: 'https://hvgblog-vcluster.hvg.hu'
-    namespace: nyomorszele
+    namespace: dev
   ignoreDifferences: []
   syncPolicy:
     automated:
       prune: true
       selfHeal: false
     syncOptions:
-      - CreateNamespace=true
+    - CreateNamespace=true

k8s/manifests/nyomorszele-application.yaml

@@ -1,43 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: dev.hvgblog.hu
-  namespace: hvg-dev
-spec:
-  project: default
-  source:
-    repoURL: "ssh://git@ssh.github.com:443/hvg-dev/blog.git"
-    path: k8s/manifests/app
-    targetRevision: dev
-    helm:
-      releaseName: hvgblog-dev-wp
-      parameters:
-        - name: host
-          value: dev.hvgblog.hu
-        - name: db.name
-          value: dev
-        - name: db.user
-          value: dev
-        # - name: env.DB_PREFIX
-        #   value: wp_
-        - name: env.BLOG_SLUG
-          value: dev
-        - name: env.S3_UPLOADS_BUCKET
-          value: hvgblog/dev
-        # - name: env.WP_DEBUG_LOG
-        #   value: /tmp/debug.log
-        - name: env.S3_UPLOADS_BUCKET_URL
-          value: https://hvgblog.ams3.cdn.digitaloceanspaces.com/dev
-        - name: image
-          value: ghcr.io/hvg-dev/blog:dev
-      valueFiles: []
-  destination:
-    server: "https://hvgblog-vcluster.hvg.hu"
-    namespace: dev
-  ignoreDifferences: []
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: false
-    syncOptions:
-      - CreateNamespace=true