Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update dhis.conf location #82

Merged
merged 1 commit into from
Nov 10, 2023
Merged

update dhis.conf location #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/dhis2/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions charts/dhis2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
10 changes: 7 additions & 3 deletions charts/dhis2/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/dhis2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,7 @@ pdb:
maxUnavailable: 1

initResources: {}

env:
# - name: DHIS2_HOME
# value: /DHIS2_home
Loading