diff --git a/package/docker/openmrs/Dockerfile b/package/docker/openmrs/Dockerfile index fbcd3fc5..a35d870f 100644 --- a/package/docker/openmrs/Dockerfile +++ b/package/docker/openmrs/Dockerfile @@ -72,6 +72,7 @@ RUN ln -s /etc/bahmni_config ${OPENMRS_APPLICATION_DATA_DIRECTORY}/bahmni_config RUN mkdir -p /home/bahmni/patient_images RUN mkdir -p /home/bahmni/document_images RUN mkdir -p /home/bahmni/uploaded_results +RUN mkdir -p /home/bahmni/uploaded-files COPY package/resources/blank-user.png /etc/bahmni/ # Used by envsubst command for replacing environment values at runtime diff --git a/package/docker/openmrs/bahmni_startup.sh b/package/docker/openmrs/bahmni_startup.sh index 4051d1b0..413ce9c7 100755 --- a/package/docker/openmrs/bahmni_startup.sh +++ b/package/docker/openmrs/bahmni_startup.sh @@ -25,6 +25,7 @@ then echo "setting the folder permissions" setfacl -R -d -m o::rx -m g::rx /home/bahmni/document_images setfacl -R -d -m o::rx -m g::rx /home/bahmni/uploaded_results +setfacl -R -d -m o::rx -m g::rx /home/bahmni/uploaded-files fi echo "Running OpenMRS Startup Script..." diff --git a/package/helm/openmrs/templates/deployment.yaml b/package/helm/openmrs/templates/deployment.yaml index 568af315..14463d4d 100644 --- a/package/helm/openmrs/templates/deployment.yaml +++ b/package/helm/openmrs/templates/deployment.yaml @@ -78,6 +78,8 @@ spec: name: bahmni-config - mountPath: /home/bahmni/uploaded_results name: bahmni-uploaded-results + - mountPath: /home/bahmni/uploaded-files + name: bahmni-uploaded-files restartPolicy: Always volumes: # - name: openmrs-data @@ -101,3 +103,6 @@ spec: - name: bahmni-uploaded-results persistentVolumeClaim: claimName: bahmni-uploaded-results-pvc + - name: bahmni-uploaded-files + persistentVolumeClaim: + claimName: bahmni-uploaded-files-pvc diff --git a/package/helm/openmrs/templates/volumes/bahmni-uploaded-files.yaml b/package/helm/openmrs/templates/volumes/bahmni-uploaded-files.yaml new file mode 100644 index 00000000..15894078 --- /dev/null +++ b/package/helm/openmrs/templates/volumes/bahmni-uploaded-files.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: {{ .Chart.Name }} + environment: {{ .Values.metadata.labels.environment }} + name: bahmni-uploaded-files-pvc +spec: + storageClassName: {{ .Values.global.storageClass }} + accessModes: + - ReadWriteMany + resources: + requests: + storage: {{ .Values.volumes.uploadedFiles.capacity }} diff --git a/package/helm/openmrs/values.yaml b/package/helm/openmrs/values.yaml index a0cf7f96..b4a856da 100644 --- a/package/helm/openmrs/values.yaml +++ b/package/helm/openmrs/values.yaml @@ -76,6 +76,8 @@ volumes: capacity: "1Gi" uploadedResults: capacity: "2Gi" + uploadedFiles: + capacity: "2Gi" nodeSelector: {} affinity: {} tolerations: {}