mirror of
https://github.com/bokysan/docker-postfix.git
synced 2025-11-12 02:31:08 +08:00
Fix #66: mount sockets into a temporary directory
This commit is contained in:
parent
5713ef4b37
commit
fb53f25c98
1 changed files with 3 additions and 17 deletions
|
|
@ -83,36 +83,22 @@ spec:
|
||||||
{{- if .Values.extraVolumeMounts }}{{- toYaml .Values.extraVolumeMounts | nindent 12 }}{{ end }}
|
{{- if .Values.extraVolumeMounts }}{{- toYaml .Values.extraVolumeMounts | nindent 12 }}{{ end }}
|
||||||
resources: {{ toYaml .Values.resources | nindent 12 }}
|
resources: {{ toYaml .Values.resources | nindent 12 }}
|
||||||
volumes:
|
volumes:
|
||||||
{{- if .Values.persistence.enabled }}
|
|
||||||
# Socket directories
|
# Socket directories
|
||||||
- name: public
|
- name: public
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: private
|
- name: private
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
{{- if .Values.persistence.existingClaim }}
|
{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
|
||||||
- name: {{ $fullName }}
|
- name: {{ $fullName }}
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
{{- with .Values.persistence.existingClaim }}
|
{{- with .Values.persistence.existingClaim }}
|
||||||
claimName: {{ tpl . $ }}
|
claimName: {{ tpl . $ }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
<<<<<<< HEAD
|
{{- else if not .Values.persistence.enabled }}
|
||||||
{{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
|
|
||||||
{{- else }}
|
|
||||||
volumes:
|
|
||||||
- name: {{ $fullName }}
|
- name: {{ $fullName }}
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
|
{{- end }}
|
||||||
{{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
|
{{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
|
||||||
{{- end }}
|
|
||||||
{{- else }}
|
|
||||||
volumes:
|
|
||||||
- name: {{ $fullName }}
|
|
||||||
emptyDir: {}
|
|
||||||
{{- if .Values.extraVolumes }}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
|
|
||||||
=======
|
|
||||||
{{ end }}
|
|
||||||
{{ if .Values.extraVolumes -}}{{- toYaml .Values.extraVolumes | nindent 8 }}{{ end }}
|
|
||||||
>>>>>>> 0b8ed0f (Fix #66: mount sockets into a temporary directory)
|
|
||||||
{{- end }}
|
|
||||||
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
||||||
volumeClaimTemplates:
|
volumeClaimTemplates:
|
||||||
- metadata:
|
- metadata:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue