fix cronjob

coopTilleuls · Apr 13, 2023 · c69f868 · c69f868
1 parent 1521f63
commit c69f868
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/helm/chart/templates/cronjob.yaml b/helm/chart/templates/cronjob.yaml
@@ -21,13 +21,19 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           serviceAccountName: {{ include "bikelib.serviceAccountName" . }}
+          securityContext:
+            {{- toYaml .Values.podSecurityContext | nindent 12 }}
           restartPolicy: Never
           containers:
             - name: {{ .Chart.Name }}-cronjob
               image: "{{ .Values.php.image.repository }}:{{ .Values.php.image.tag | default .Chart.AppVersion }}"
               imagePullPolicy: {{ .Values.php.image.pullPolicy }}
               command: ['/bin/sh', '-c']
-              args: ['composer install --prefer-dist --no-progress --no-suggest --no-interaction && bin/console doctrine:schema:drop --force --no-interaction && bin/console doctrine:migrations:version --delete --all --no-interaction && bin/console doctrine:migrations:migrate --no-interaction && bin/console hautelook:fixtures:load --no-interaction']
+              args: ['
+                set -ex;
+                bin/console doctrine:schema:drop --full-database --force;
+                bin/console doctrine:migrations:migrate --no-interaction;
+              ']
               env:
                 - name: API_ENTRYPOINT_HOST
                   valueFrom:
@@ -60,9 +66,15 @@ spec:
                       name: {{ include "bikelib.fullname" . }}
                       key: php-trusted-proxies
                 - name: APP_ENV
-                  value: "dev"
+                  valueFrom:
+                    configMapKeyRef:
+                      name: {{ include "bikelib.fullname" . }}
+                      key: php-app-env
                 - name: APP_DEBUG
-                  value: "1"
+                  valueFrom:
+                    configMapKeyRef:
+                      name: {{ include "bikelib.fullname" . }}
+                      key: php-app-debug
                 - name: APP_SECRET
                   valueFrom:
                     secretKeyRef:

diff --git a/helm/chart/test_minikube.sh b/helm/chart/test_minikube.sh
@@ -32,7 +32,8 @@ helm upgrade --install demo ./helm/chart \
   -f ./helm/chart/values-minikube.yml \
   --set   php.image.tag=$php_sha \
   --set caddy.image.tag=$caddy_sha \
-  --set pwa.image.tag=$pwa_sha
+  --set pwa.image.tag=$pwa_sha \
+  --set dailyCronjobDbReset.enabled=true
 
 MINIKUBE_IP=$(minikube ip)
 if ! grep -E "^$MINIKUBE_IP\s+(.+\s+)?bikelib.chart-example.local" /etc/hosts; then