From 6e1556901363e47537f10fde55bbcca5dab37660 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 14 Jun 2019 17:04:44 +0000
Subject: [PATCH] 4.9.0-1-ol-7-r11 release

---
 bitnami/phpmyadmin/4/ol-7/Dockerfile                | 13 ++++++++++---
 .../phpmyadmin/4/ol-7/rootfs/phpmyadmin-inputs.json |  7 +++++++
 bitnami/phpmyadmin/README.md                        |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bitnami/phpmyadmin/4/ol-7/Dockerfile b/bitnami/phpmyadmin/4/ol-7/Dockerfile
index 51ac40463a61..9fce6eabaf38 100644
--- a/bitnami/phpmyadmin/4/ol-7/Dockerfile
+++ b/bitnami/phpmyadmin/4/ol-7/Dockerfile
@@ -6,7 +6,7 @@ RUN install_packages bzip2-libs cyrus-sasl-lib expat freetds freetype glibc gmp
 RUN bitnami-pkg unpack apache-2.4.39-2 --checksum bd13d67036ecb691256893b0ba4034364b90c05747b2afbaa3c097fb218bc2e1
 RUN bitnami-pkg unpack php-7.3.6-0 --checksum b20cbea457402af917621d907be38dcade30796fbf845acbafe82911a178a0a4
 RUN bitnami-pkg install libphp-7.3.6-0 --checksum 2e670baa8b1b793ac294a92c1df304a7c3b29319545c780050ec4a91b6ae35e4
-RUN bitnami-pkg unpack phpmyadmin-4.9.0-1-0 --checksum fd48582b1bb639e53df30d886151c4e3d0701e3bcdcea647f6ba553ecb562df0
+RUN bitnami-pkg unpack phpmyadmin-4.9.0-1-1 --checksum 3e4e5d989ae22bf94e2f64ac03359262b5c4fa4d407fed47e9ce78d72e518d04
 RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
 RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log
 
@@ -16,13 +16,20 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_SET_HTTPS_PORT="no" \
     APACHE_SET_HTTP_PORT="no" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="4.9.0-1-ol-7-r10" \
+    BITNAMI_IMAGE_VERSION="4.9.0-1-ol-7-r11" \
+    DATABASE_ENABLE_SSL="no" \
     DATABASE_HOST="mariadb" \
     DATABASE_PORT_NUMBER="3306" \
+    DATABASE_SSL_CA="" \
+    DATABASE_SSL_CA_PATH="" \
+    DATABASE_SSL_CERT="" \
+    DATABASE_SSL_CIPHERS="" \
+    DATABASE_SSL_KEY="" \
+    DATABASE_SSL_VERIFY="yes" \
     PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:$PATH" \
     PHPMYADMIN_ALLOW_ARBITRARY_SERVER="" \
     PHPMYADMIN_ALLOW_NO_PASSWORD="true" \
-    REQUIRE_LOCAL="0"
+    REQUIRE_LOCAL="no"
 
 VOLUME [ "/certs" ]
 
diff --git a/bitnami/phpmyadmin/4/ol-7/rootfs/phpmyadmin-inputs.json b/bitnami/phpmyadmin/4/ol-7/rootfs/phpmyadmin-inputs.json
index 8d4ef7f17c2d..1b1b41a9d51b 100644
--- a/bitnami/phpmyadmin/4/ol-7/rootfs/phpmyadmin-inputs.json
+++ b/bitnami/phpmyadmin/4/ol-7/rootfs/phpmyadmin-inputs.json
@@ -3,5 +3,12 @@
   "allowNoPassword": "{{$global.env.PHPMYADMIN_ALLOW_NO_PASSWORD}}",
   "databaseServerHost": "{{$global.env.DATABASE_HOST}}",
   "databaseServerPort": "{{$global.env.DATABASE_PORT_NUMBER}}",
+  "databaseServerSsl": "{{$global.env.DATABASE_ENABLE_SSL}}",
+  "databaseServerSslCa": "{{$global.env.DATABASE_SSL_CA}}",
+  "databaseServerSslCaPath": "{{$global.env.DATABASE_SSL_CA_PATH}}",
+  "databaseServerSslCert": "{{$global.env.DATABASE_SSL_CERT}}",
+  "databaseServerSslCiphers": "{{$global.env.DATABASE_SSL_CIPHERS}}",
+  "databaseServerSslKey": "{{$global.env.DATABASE_SSL_KEY}}",
+  "databaseServerSslVerify": "{{$global.env.DATABASE_SSL_VERIFY}}",
   "requireLocal": "{{$global.env.REQUIRE_LOCAL}}"
 }
\ No newline at end of file
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index e3a332524430..f70c497af823 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`4-ol-7`, `4.9.0-1-ol-7-r10` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-ol-7-r10/4/ol-7/Dockerfile)
+* [`4-ol-7`, `4.9.0-1-ol-7-r11` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-ol-7-r11/4/ol-7/Dockerfile)
 * [`4-debian-9`, `4.9.0-1-debian-9-r12`, `4`, `4.9.0-1`, `4.9.0-1-r12`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-debian-9-r12/4/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).