diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10015aa..64e4092 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - HELM_CHART_VERSION: "0.8.7" + HELM_CHART_VERSION: "0.0.1" stages: - deploy diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml index 0d7ae6e..bc492e5 100644 --- a/Chart/Chart.yaml +++ b/Chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: cloudypress description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit type: application -version: "0.8.7" +version: "0.0.1" appVersion: "6.2.0" diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml index 8ed6d5b..cb39f30 100644 --- a/Chart/templates/configmap.yaml +++ b/Chart/templates/configmap.yaml @@ -28,7 +28,7 @@ data: SMTP_FROM_NAME: "V3 Customer Mailer" {{- end }} - WP_ENV: "production" + WP_ENV: "{{ .Values.site.env | default "production" }}" {{- if .Values.site.overrideMainUrl }} WP_HOME: "https://{{ .Values.site.overrideMainUrl }}" {{- else }} diff --git a/Chart/templates/persistentvolume.yaml b/Chart/templates/persistentvolume.yaml index 16d88bd..f89f79b 100644 --- a/Chart/templates/persistentvolume.yaml +++ b/Chart/templates/persistentvolume.yaml @@ -35,4 +35,4 @@ spec: persistentVolumeReclaimPolicy: Retain storageClassName: {{ .Values.site.storage.cloud.class }}-retain volumeMode: Filesystem ---- \ No newline at end of file +--- diff --git a/Chart/templates/persistentvolumeclaim.yaml b/Chart/templates/persistentvolumeclaim.yaml index ad227d5..7121bad 100644 --- a/Chart/templates/persistentvolumeclaim.yaml +++ b/Chart/templates/persistentvolumeclaim.yaml @@ -19,4 +19,4 @@ spec: {{- if and .Values.site .Values.site.storage .Values.site.storage.cloud }} storageClassName: {{ .Values.site.storage.cloud.class }}-retain -{{- end }} \ No newline at end of file +{{- end }} diff --git a/Chart/values.yaml b/Chart/values.yaml index 9716264..39101af 100644 --- a/Chart/values.yaml +++ b/Chart/values.yaml @@ -37,6 +37,8 @@ email: {} # Website Configuration site: + env: "development" + # The main URL for the website url: "www.mycustomer.com" @@ -46,7 +48,7 @@ site: # Create sites with another main domain for WP, # but the rest of the components named according to site-tld - # overrideMainUrl: "" + overrideMainUrl: "" # Whether to keep plugins and Wordpress updated autoUpdate: 'true'