From c3ef2e0de77b63d8a5ef2cd9e737256f15c186de Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 29 May 2017 09:45:37 +0000
Subject: [PATCH] 4.7.0-r1 release

Update image to version 4.7.0-r1
---
 bitnami/phpmyadmin/4/Dockerfile                    | 14 +++++++++-----
 bitnami/phpmyadmin/4/rootfs/apache-inputs.json     |  4 ++--
 bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json |  2 +-
 bitnami/phpmyadmin/README.md                       |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/bitnami/phpmyadmin/4/Dockerfile b/bitnami/phpmyadmin/4/Dockerfile
index 18ffab1c3a3c..19de85a63fc5 100644
--- a/bitnami/phpmyadmin/4/Dockerfile
+++ b/bitnami/phpmyadmin/4/Dockerfile
@@ -1,6 +1,8 @@
-FROM bitnami/minideb-extras:jessie-r15
+FROM bitnami/minideb-extras:jessie-r16
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
+
+
 # Install required system packages and dependencies
 RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
@@ -10,17 +12,19 @@ RUN bitnami-pkg unpack phpmyadmin-4.7.0-1 --checksum 64d5643e56167d919c5206f11be
 
 COPY rootfs /
 
-ENV APACHE_HTTPS_PORT="443" \
-    APACHE_HTTP_PORT="80" \
+ENV APACHE_HTTPS_PORT_NUMBER="443" \
+    APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="phpmyadmin" \
-    BITNAMI_IMAGE_VERSION="4.7.0-r0" \
+    BITNAMI_IMAGE_VERSION="4.7.0-r1" \
     DATABASE_HOST="mariadb" \
-    DATABASE_PORT="3306" \
+    DATABASE_PORT_NUMBER="3306" \
     PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:$PATH" \
     PHPMYADMIN_ALLOW_ARBITRARY_SERVER="" \
     PHPMYADMIN_ALLOW_NO_PASSWORD="true" \
     REQUIRE_LOCAL="0"
 
+
+
 VOLUME ["/bitnami/apache","/bitnami/php","/bitnami/phpmyadmin"]
 
 EXPOSE 80 443
diff --git a/bitnami/phpmyadmin/4/rootfs/apache-inputs.json b/bitnami/phpmyadmin/4/rootfs/apache-inputs.json
index 2351b006ed67..493f9fc7b0fa 100644
--- a/bitnami/phpmyadmin/4/rootfs/apache-inputs.json
+++ b/bitnami/phpmyadmin/4/rootfs/apache-inputs.json
@@ -1,4 +1,4 @@
 {
-  "httpPort": "{{$global.env.APACHE_HTTP_PORT}}",
-  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT}}"
+  "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
 }
\ No newline at end of file
diff --git a/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json b/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
index 9d354646b87a..8d4ef7f17c2d 100644
--- a/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
+++ b/bitnami/phpmyadmin/4/rootfs/phpmyadmin-inputs.json
@@ -2,6 +2,6 @@
   "allowArbitraryServer": "{{$global.env.PHPMYADMIN_ALLOW_ARBITRARY_SERVER}}",
   "allowNoPassword": "{{$global.env.PHPMYADMIN_ALLOW_NO_PASSWORD}}",
   "databaseServerHost": "{{$global.env.DATABASE_HOST}}",
-  "databaseServerPort": "{{$global.env.DATABASE_PORT}}",
+  "databaseServerPort": "{{$global.env.DATABASE_PORT_NUMBER}}",
   "requireLocal": "{{$global.env.REQUIRE_LOCAL}}"
 }
\ No newline at end of file
diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md
index 96475aa7cbff..465ace1df0db 100644
--- a/bitnami/phpmyadmin/README.md
+++ b/bitnami/phpmyadmin/README.md
@@ -19,7 +19,7 @@ $ docker-compose up
 
 ## Kubernetes
 
-> **WARNING**: This is a beta configuration, currently unsupported.
+> **WARNING:** This is a beta configuration, currently unsupported.
 
 Get the raw URL pointing to the kubernetes.yml manifest and use kubectl to create the resources on your Kubernetes cluster like so:
 
@@ -253,7 +253,7 @@ The phpMyAdmin instance can be customized by specifying environment variables on
 - `PHPMYADMIN_ALLOW_ARBITRARY_SERVER`: Allows you to enter database server hostname on login form. Default: **false**
 - `PHPMYADMIN_ALLOW_NO_PASSWORD`: Whether to allow logins without a password. Default: **true**
 - `DATABASE_HOST`: Database server host. Default: **mariadb**
-- `DATABASE_PORT`: Database server port. Default: **3306**
+- `DATABASE_PORT_NUMBER`: Database server port. Default: **3306**
 - `WEBSERVER_REQUIRE`: Tests whether an authenticated user is authorized by an authorization provider. Default: **all granted**
 
 ### Specifying Environment variables using Docker Compose