Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/drupal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: drupal
apiVersion: v2
type: application
version: 2.0.0-beta1
version: 2.0.0-beta2
appVersion: 6.1.4
description: Helm Chart for deploying an enterprise-grade Drupal environment.
keywords:
Expand Down
8 changes: 4 additions & 4 deletions charts/drupal/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Create initContainers for Drupal
{{- define "drupal.initContainers" -}}
{{- if .Values.drupal.volumePermissions.enabled }}
- name: set-volume-permissions
image: 'alpine:3.10'
image: {{ .Values.drupal.initContainerImage | quote }}
command:
- chown
- '-R'
Expand All @@ -132,7 +132,7 @@ Create initContainers for Drupal
{{- end }}
{{- if .Values.azure.sharedDisk.enabled }}
- name: init-chown
image: 'alpine:3.10'
image: {{ .Values.drupal.initContainerImage | quote }}
command:
- chown
- '-R'
Expand All @@ -144,7 +144,7 @@ Create initContainers for Drupal
{{- end }}
{{- if or (and .Values.azure.azureFile.enabled .Values.azure.azureFile.initMediaIconsFolder) (and .Values.azure.sharedDisk.enabled .Values.azure.sharedDisk.initMediaIconsFolder) }}
- name: init-media-icons-folder
image: 'alpine:3.10'
image: {{ .Values.drupal.initContainerImage | quote }}
command:
- mkdir
- '-p'
Expand All @@ -155,7 +155,7 @@ Create initContainers for Drupal
{{- end }}
{{- if not (eq .Values.drupal.siteRoot "/") }}
- name: init-site-root
image: 'alpine:3.10'
image: {{ .Values.drupal.initContainerImage | quote }}
command:
- /bin/sh
- '-c'
Expand Down
2 changes: 1 addition & 1 deletion charts/drupal/templates/deploy/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
initContainers:
{{- if not (eq .Values.drupal.siteRoot "/") }}
- name: init-site-root
image: 'alpine:3.10'
image: {{ .Values.drupal.initContainerImage | quote }}
command:
- /bin/sh
- '-c'
Expand Down
3 changes: 3 additions & 0 deletions charts/drupal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ drupal:
##
image: drupalwxt/site-wxt

## Init container image for volume permission setup
initContainerImage: alpine:3.10

## Note that by default we use appVersion to get image tag
# tag: 6.1.0

Expand Down