From a2c1d2cf19b7ba6720ff8505b3aa02e8a87a3034 Mon Sep 17 00:00:00 2001
From: bennsimon <botieno@ona.io>
Date: Fri, 10 Nov 2023 11:28:36 +0300
Subject: [PATCH] update dhis.conf location

---
 charts/dhis2/Chart.yaml                |  2 +-
 charts/dhis2/README.md                 |  1 +
 charts/dhis2/templates/deployment.yaml | 10 +++++++---
 charts/dhis2/values.yaml               |  4 ++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/charts/dhis2/Chart.yaml b/charts/dhis2/Chart.yaml
index de3faa3..9bbbdec 100644
--- a/charts/dhis2/Chart.yaml
+++ b/charts/dhis2/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.3
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/dhis2/README.md b/charts/dhis2/README.md
index 0bbf4e8..5929b43 100644
--- a/charts/dhis2/README.md
+++ b/charts/dhis2/README.md
@@ -76,3 +76,4 @@ The following table lists the configurable parameters of the Dhis2 chart and the
 | `pdb.minAvailable` | `Number of pods that must be available during a disruption. Can be an absolute number or a percentage` | `1` |
 | `pdb.maxUnavailable` | `Number of pods that can be unavailable during a disruption. Can be an absolute number or a percentage` | `""` |
 | `initResources` |  | `{}` |
+| `env` |  | `null` |
diff --git a/charts/dhis2/templates/deployment.yaml b/charts/dhis2/templates/deployment.yaml
index f394614..26cbe5a 100644
--- a/charts/dhis2/templates/deployment.yaml
+++ b/charts/dhis2/templates/deployment.yaml
@@ -28,13 +28,13 @@ spec:
       initContainers:
         - name: prepopulate-dhis-web-volume
           image: busybox
-          command: ['sh', '-c', 'cp /config/dhis.conf /DHIS2_home']
+          command: ['sh', '-c', 'cp /config/dhis.conf /opt/dhis2']
           volumeMounts:
             - name: dhis-config-map
               mountPath: /config/dhis.conf
               subPath: dhis2-conf
             - name: dhis-web-volume
-              mountPath: /DHIS2_home
+              mountPath: /opt/dhis2
           resources:
             {{- toYaml .Values.initResources | nindent 12 }}
       volumes:
@@ -51,7 +51,11 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - name: dhis-web-volume
-              mountPath: /DHIS2_home
+              mountPath: /opt/dhis2
+          {{- if .Values.env }}
+          env:
+            {{- tpl (toYaml .Values.env) .  | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: 8080
diff --git a/charts/dhis2/values.yaml b/charts/dhis2/values.yaml
index ef0671a..9ac50bd 100644
--- a/charts/dhis2/values.yaml
+++ b/charts/dhis2/values.yaml
@@ -132,3 +132,7 @@ pdb:
   maxUnavailable: 1
 
 initResources: {}
+
+env:
+#  - name: DHIS2_HOME
+#    value: /DHIS2_home