diff --git a/charts/drupal/Chart.yaml b/charts/drupal/Chart.yaml index ddf2890..2c32c8d 100644 --- a/charts/drupal/Chart.yaml +++ b/charts/drupal/Chart.yaml @@ -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: diff --git a/charts/drupal/templates/_helpers.tpl b/charts/drupal/templates/_helpers.tpl index b4a78d9..4a2142c 100644 --- a/charts/drupal/templates/_helpers.tpl +++ b/charts/drupal/templates/_helpers.tpl @@ -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' @@ -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' @@ -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' @@ -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' diff --git a/charts/drupal/templates/deploy/nginx.yaml b/charts/drupal/templates/deploy/nginx.yaml index 64ca696..ee72db0 100644 --- a/charts/drupal/templates/deploy/nginx.yaml +++ b/charts/drupal/templates/deploy/nginx.yaml @@ -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' diff --git a/charts/drupal/values.yaml b/charts/drupal/values.yaml index 11e2019..c3a3166 100644 --- a/charts/drupal/values.yaml +++ b/charts/drupal/values.yaml @@ -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