added spread topology, wait for install in mautic-console image

Author: audacioustux

Taskfile.yaml

@@ -6,7 +6,7 @@ tasks:
       - docker buildx create --name multiarch --bootstrap --use
   docker:build:
     env:
-      VERSION: 5.1.22
+      VERSION: 5.1.24
     cmds:
       - docker build --platform linux/amd64,linux/arm64 --builder=multiarch -t docker.io/tanjim/mautic:install-$VERSION --target=install --push .
       - docker build --platform linux/amd64,linux/arm64 --builder=multiarch -t docker.io/tanjim/mautic:console-$VERSION --target=console --push .

charts/mautic/templates/deployment.yaml

@@ -42,6 +42,15 @@ spec:
             {{- toYaml .Values.mautic.web.resources | nindent 12 }}
           volumeMounts:
             {{- include "mautic.volumeMounts" . | nindent 12 }}
+      {{- with .Values.mautic.web.topologySpreadConstraints }}
+      topologySpreadConstraints:
+      {{- range . }}
+        - {{ . | toYaml | indent 10 | trim }}
+          labelSelector:
+            matchLabels:
+              {{- include "mautic.selectorLabels" $ | nindent 14 }}
+      {{- end }}
+      {{- end }}
       volumes: 
         {{- include "mautic.volumes" . | nindent 8 }}
 ---

charts/mautic/values.yaml

@@ -5,7 +5,7 @@ mautic:
   image:
     repository: docker.io/tanjim/mautic
     pullPolicy: IfNotPresent
-    tag: "5.1.22"
+    tag: "5.1.24"
 
   # existingConfigMap: ""
   # ignore the following values if existingConfigMap is set
@@ -65,7 +65,11 @@ mautic:
       <<: *probe
       failureThreshold: 30
       periodSeconds: 10
-
+    topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: "kubernetes.io/hostname"
+        whenUnsatisfiable: ScheduleAnyway
+      
   install:
     # optional, if SITE_URL is not set in configMap
     siteUrl: "https://localhost:8080"

dockerfile

@@ -100,5 +100,7 @@ FROM core as console
 ENV PHP_INI_VALUE_MAX_EXECUTION_TIME=600 \
     PHP_INI_VALUE_MEMORY_LIMIT=-1
 
-ENTRYPOINT ["php", "bin/console", "--no-interaction", "--no-ansi"]
+COPY ./entrypoints/console.sh /entrypoint.sh
+
+ENTRYPOINT [ "./entrypoint.sh" ]
 CMD ["--help"]

entrypoints/console.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Waiting for Mautic to be installed..."
+until php bin/is_installed.php; do
+	sleep 5
+done
+
+php bin/console --no-interaction --no-ansi "$@"