Add load-moqui initContainer.

@@ -91,9 +91,9 @@ EXPOSE 5701
 
 # this is to run from the war file directly, preferred approach unzips war file in advance
 # ENTRYPOINT ["java", "-jar", "moqui.war"]
-ENTRYPOINT ["java", "-cp", ".", "MoquiStart", "port=8080"]
+ENTRYPOINT ["java", "-cp", ".", "MoquiStart"]
 
 HEALTHCHECK --interval=30s --timeout=600ms --start-period=120s CMD curl -f -H "X-Forwarded-Proto: https" -H "X-Forwarded-Ssl: on" http://localhost:8080/status || exit 1
 # specify this as a default parameter if none are specified with docker exec/run, ie run production by default
-CMD ["conf=conf/MoquiProductionConf.xml"]
+CMD ["port=8080", "conf=conf/MoquiProductionConf.xml"]
 

@@ -15,6 +15,8 @@ data:
   entity_ds_schema: public
   _entity_add_missing_runtime: "true"
   moqui_load_types: seed,seed-initial,install
+  moqui.conf: "conf/MoquiProductionConf.xml"
+  jetty_threads: "100"
 ---
 apiVersion: v1
 kind: Secret
@@ -101,6 +103,8 @@ spec:
         - name: txlog
           persistentVolumeClaim:
             claimName: moqui-txlog
+        - name: txlog-init
+          emptyDir: {}
         - name: sessions
           persistentVolumeClaim:
             claimName: moqui-sessions
@@ -122,10 +126,38 @@ spec:
             - name: lib
               mountPath: /mnt/jdbc-drivers
 
+        - name: load-moqui
+          image: moqui-app:latest
+          imagePullPolicy: IfNotPresent
+          args: ["load", "conf=$(moqui.conf)", "types=$(moqui_load_types)"]
+          resources:
+            limits:
+              memory: 1Gi
+            requests:
+              memory: 1Gi
+          envFrom:
+            - configMapRef:
+                name: moqui
+            - secretRef:
+                name: moqui
+          env:
+            - name: entity_add_missing_runtime
+              value: "true"
+          volumeMounts:
+            - name: lib
+              mountPath: /opt/moqui/runtime/lib
+            - name: log
+              mountPath: /opt/moqui/runtime/log
+            - name: txlog-init
+              mountPath: /opt/moqui/runtime/txlog
+            - name: sessions
+              mountPath: /opt/moqui/runtime/sessions
+
       containers:
         - name: moqui
           image: moqui-app:latest
           imagePullPolicy: IfNotPresent
+          args: ["port=8080", "conf=$(moqui.conf)", "threads=$(jetty_threads)"]
           resources:
             limits:
               memory: 1Gi
@@ -136,6 +168,9 @@ spec:
                 name: moqui
             - secretRef:
                 name: moqui
+          env:
+            - name: entity_add_missing_runtime
+              value: "false"
           volumeMounts:
             - name: lib
               mountPath: /opt/moqui/runtime/lib

@@ -103,7 +103,7 @@ releases:
                 name: {{ .Values.name }}-moqui-postgresql-scripts
                 defaultMode: 0755
           - op: add
-            path: /spec/template/spec/initContainers/-
+            path: /spec/template/spec/initContainers/0
             value:
               name: wait-for-pg
               image: {{ .Values.postgresql.images | get "wait-for-pg.name" }}
@@ -137,7 +137,7 @@ releases:
                 name: {{ .Values.name }}-moqui-elasticsearch-scripts
                 defaultMode: 0755
           - op: add
-            path: /spec/template/spec/initContainers/-
+            path: /spec/template/spec/initContainers/0
             value:
               name: wait-for-elasticsearch
               image: {{ .Values.app.images | get "moqui-app.name" }}
@@ -229,12 +229,11 @@ releases:
                   image: {{ .Values.app.images | get "moqui-jdbc-drivers.name" }}
                   imagePullPolicy: {{ .Values.app.images | get "moqui-jdbc-drivers.pullPolicy" }}
 
-              containers:
-                - name: moqui
+                - name: load-moqui
                   image: {{ .Values.app.images | get "moqui-app.name" }}
                   imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }}
-                  resources: {{ .Values.app.resources | toYaml | nindent 20 }}
                   env:
+                  {{- block "moquideps" . }}
                     {{- if .Values.elasticsearch.enabled }}
                     - name: kibana_host
                       value: {{ .Values.name }}-moqui-kb-http
@@ -270,5 +269,14 @@ releases:
                     - name: entity_ds_schema
                       value: public
                     {{- end }}
+                  {{- end }}
+
+              containers:
+                - name: moqui
+                  image: {{ .Values.app.images | get "moqui-app.name" }}
+                  imagePullPolicy: {{ .Values.app.images | get "moqui-app.pullPolicy" }}
+                  resources: {{ .Values.app.resources | toYaml | nindent 20 }}
+                  env:
+                  {{- template "moquideps" . }}