From bea1680452b582f6abdea779ad71ea5e6ddb7a4a Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Wed, 15 Aug 2018 10:36:25 +0000 Subject: [PATCH] Synchronize upstreamed folder to abf3585 --- upstreamed/ghost/Chart.yaml | 4 ++-- upstreamed/ghost/requirements.lock | 4 ++-- upstreamed/ghost/values.yaml | 2 +- upstreamed/wordpress/Chart.yaml | 2 +- upstreamed/wordpress/README.md | 2 +- upstreamed/wordpress/templates/deployment.yaml | 6 +++++- upstreamed/wordpress/values.yaml | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index fe2989de2..e099019af 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ name: ghost -version: 4.0.15 -appVersion: 1.25.4 +version: 4.0.16 +appVersion: 1.25.5 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/requirements.lock b/upstreamed/ghost/requirements.lock index 7b7ab61c7..00eff962a 100644 --- a/upstreamed/ghost/requirements.lock +++ b/upstreamed/ghost/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.3.2 + version: 4.3.3 digest: sha256:8a53e73537f5a2d9073c3b1173b9c6b814c2baeb2e8e31485e2ad52172c0b296 -generated: 2018-08-10T08:56:29.286309729Z +generated: 2018-08-14T16:34:51.754043943Z diff --git a/upstreamed/ghost/values.yaml b/upstreamed/ghost/values.yaml index 5342a3052..e337706b9 100644 --- a/upstreamed/ghost/values.yaml +++ b/upstreamed/ghost/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/ghost - tag: 1.25.4-debian-9 + tag: 1.25.5-debian-9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index 594df7917..58b6f7449 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,5 +1,5 @@ name: wordpress -version: 2.1.8 +version: 2.1.10 appVersion: 4.9.8 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/README.md b/upstreamed/wordpress/README.md index 5859a17fa..02e33890b 100644 --- a/upstreamed/wordpress/README.md +++ b/upstreamed/wordpress/README.md @@ -59,7 +59,7 @@ The following table lists the configurable parameters of the WordPress chart and | `wordpressLastName` | Last name | `LastName` | | `wordpressBlogName` | Blog name | `User's Blog!` | | `wordpressTablePrefix` | Table prefix | `wp_` | -| `allowEmptyPassword` | Allow DB blank passwords | `yes` | +| `allowEmptyPassword` | Allow DB blank passwords | `true` | | `smtpHost` | SMTP host | `nil` | | `smtpPort` | SMTP port | `nil` | | `smtpUser` | SMTP user | `nil` | diff --git a/upstreamed/wordpress/templates/deployment.yaml b/upstreamed/wordpress/templates/deployment.yaml index c5ab3d3ec..f22927b6e 100644 --- a/upstreamed/wordpress/templates/deployment.yaml +++ b/upstreamed/wordpress/templates/deployment.yaml @@ -28,7 +28,11 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: ALLOW_EMPTY_PASSWORD - value: {{ .Values.allowEmptyPassword | quote }} + {{- if .Values.allowEmptyPassword }} + value: "yes" + {{- else }} + value: "no" + {{- end }} - name: MARIADB_HOST {{- if .Values.mariadb.enabled }} value: {{ template "mariadb.fullname" . }} diff --git a/upstreamed/wordpress/values.yaml b/upstreamed/wordpress/values.yaml index 3cb66dafd..3326248ce 100644 --- a/upstreamed/wordpress/values.yaml +++ b/upstreamed/wordpress/values.yaml @@ -53,9 +53,9 @@ wordpressBlogName: User's Blog! ## wordpressTablePrefix: wp_ -## Set to `yes` to allow the container to be started with blank passwords +## Set to `false` to allow the container to be started with blank passwords ## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables -allowEmptyPassword: yes +allowEmptyPassword: true ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-wordpress/#smtp-configuration